summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-01-12 22:44:27 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-01-12 22:44:27 +0000
commitf83a180de8c3ae8ac679895daebf48100df54fff (patch)
treece896e7c0032f37d2574df19791737890664e0a1
parent535ad73c04feb2ffba82fb1ed7aa7e4bf5a5b5ed (diff)
downloaddeluge-f83a180de8c3ae8ac679895daebf48100df54fff.tar.gz
deluge-f83a180de8c3ae8ac679895daebf48100df54fff.tar.bz2
deluge-f83a180de8c3ae8ac679895daebf48100df54fff.zip
Update bencode.py from BitTorrent-5.2.2. This changes the license to
Python Software Foundation License Version 2.3.
-rw-r--r--deluge/bencode.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/deluge/bencode.py b/deluge/bencode.py
index 823009132..b9cc3dcdc 100644
--- a/deluge/bencode.py
+++ b/deluge/bencode.py
@@ -1,7 +1,7 @@
-# The contents of this file are subject to the BitTorrent Open Source License
-# Version 1.1 (the License). You may not copy or use this file, in either
-# source code or executable form, except in compliance with the License. You
-# may obtain a copy of the License at http://www.bittorrent.com/license/.
+# The contents of this file are subject to the Python Software Foundation
+# License Version 2.3 (the License). You may not copy or use this file, in
+# either source code or executable form, except in compliance with the License.
+# You may obtain a copy of the License at http://www.python.org/license.
#
# Software distributed under the License is distributed on an AS IS basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ -10,6 +10,8 @@
# Written by Petru Paler
+# Minor modifications made by Andrew Resch to replace the BTFailure errors with Exceptions
+
def decode_int(x, f):
f += 1
newf = x.index('e', f)