mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-05 07:58:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mostly pep8 fixes

Browse source
This commit is contained in:
Marcos Pinto 2007-07-13 01:13:13 +00:00
commit 63d19d05bc
15 changed files with 1048 additions and 1035 deletions
Download patch file Download diff file Expand all files Collapse all files

3
LICENSE
View file

@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
@ -348,4 +348,3 @@ Public License instead of this License.
but you are not obligated to do so. If you do not wish to do so, delete
this exception statement from your version. If you delete this exception
statement from all source files in the program, then also delete it here.

35
README
View file

@ -12,9 +12,8 @@ Homepage: http://deluge-torrent.org
Installation Instructions:
==========================
First, make sure you have the proper bulid
dependencies installed. On a normal Debian
or Ubuntu system, those dependencies are:
First, make sure you have the proper bulid dependencies installed. On a normal
Debian or Ubuntu system, those dependencies are:
g++
python-all-dev
@ -31,16 +30,13 @@ libboost-serialization-dev
libssl-dev
zlib1g-dev
But the names of the packages may vary
depending on your OS / distro.
But the names of the packages may vary depending on your OS / distro.
Once you have the needed libraries installed,
build Deluge by running:
Once you have the needed libraries installed, build Deluge by running:
python setup.py build
You shouldn't get any errors. Then run, as
root (or by using sudo):
You shouldn't get any errors. Then run, as root (or by using sudo):
python setup.py install
@ -52,17 +48,12 @@ You can then run Deluge by executing:
Notes:
1) On some distributions, boost libraries are
renamed to have "-mt" at the end (boost_thread_mt
instead of boost_thread, for example), the "mt"
indicating "multithreaded". In some cases it
appears the distros lack symlinks to connect
things. The solution is to either add symlinks
from the short names to those with "-mt", or to
alter setup.py to look for the "-mt" versions.
1) On some distributions, boost libraries are renamed to have "-mt" at the end
(boost_thread_mt instead of boost_thread, for example), the "mt" indicating
"multithreaded". In some cases it appears the distros lack symlinks to connect
things. The solution is to either add symlinks from the short names to those
with "-mt", or to alter setup.py to look for the "-mt" versions.
2) After upgrading your Deluge installation, it
may fail to start. If this happens to you, you
need to remove your ~/.config/deluge directory
to allow Deluge to rebuild it's configuration
file.
2) After upgrading your Deluge installation, it may fail to start. If this
happens to you, you need to remove your ~/.config/deluge directory to allow
Deluge to rebuild it's configuration file.

15
README.Packagers
View file

@ -1,11 +1,8 @@
NOTE: Deluge 0.5.1 uses an unstable build of libtorrent. This
build differs from a clean libtorrent source checkout and has
been hacked in order to get it to work properly with Deluge.
As a result, Deluge will likely not build properly against a
vanilla libtorrent 0.12 installation or a nightly build of
libtorrent 0.13. It is recommended that you build against our
included libtorrent, as our build will not conflict with any
installed libtorrent.
NOTE: Deluge 0.5.1 uses an unstable build of libtorrent. This build differs
from a clean libtorrent source checkout and has been hacked in order to get it
to work properly with Deluge. As a result, Deluge will likely not build
properly against a vanilla libtorrent 0.12 installation or a nightly build of
libtorrent 0.13. It is recommended that you build against our included
libtorrent, as our build will not conflict with any installed libtorrent.
- zachtib

625
po/deluge.pot
View file

File diff suppressed because it is too large Load diff

9
setup.py
View file

@ -28,7 +28,7 @@
NAME = "deluge"
FULLNAME = "Deluge BitTorrent Client"
VERSION = "0.5.2.7"
VERSION = "0.5.2.90"
AUTHOR = "Zach Tibbitts, Alon Zakai, Marcos Pinto, Andrew Resch"
EMAIL = "zach@collegegeek.org, kripkensteiner@gmail.com, marcospinto@dipconsultants.com, alonzakai@gmail.com"
DESCRIPTION = "A bittorrent client written in PyGTK"
@ -96,10 +96,12 @@ python_version = platform.python_version()[0:3]
# it has been removed to prevent confusion.
if not OS == "win":
EXTRA_COMPILE_ARGS = ["-Wno-missing-braces", "-DHAVE_INCLUDE_LIBTORRENT_ASIO____ASIO_HPP=1",
EXTRA_COMPILE_ARGS = ["-Wno-missing-braces",
"-DHAVE_INCLUDE_LIBTORRENT_ASIO____ASIO_HPP=1",
"-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
"-DHAVE_INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
"-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1", "-DNDEBUG", "-O2"]
"-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1",
"-DNDEBUG", "-O2"]
if ARCH == "x64":
EXTRA_COMPILE_ARGS.append("-DAMD64")
@ -297,4 +299,3 @@ setup(name=NAME, fullname=FULLNAME, version=VERSION,
ext_modules=[deluge_core],
cmdclass=cmdclass
)

2
src/common.py
View file

@ -38,7 +38,7 @@ import xdg.BaseDirectory
import gettext
PROGRAM_NAME = "Deluge"
PROGRAM_VERSION = "0.5.2.7"
PROGRAM_VERSION = "0.5.2.90"
CLIENT_CODE = "DE"
CLIENT_VERSION = "".join(PROGRAM_VERSION.split('.'))+"0"*(4 - len(PROGRAM_VERSION.split('.')))

2
src/core.py
View file

@ -192,7 +192,7 @@ class Manager:
InvalidTorrentError)
# Start up the core
assert(len(version) == 4)
assert(len(version) == 5)
deluge_core.init(client_ID,
int(version[0]),
int(version[1]),