python3: Fix indentation and other import issues

[ipfire.org.git] / src / backend / tracker.py

diff --git a/src/backend/tracker.py b/src/backend/tracker.py
index cabf545a7ce8b58bde533791533d18ef2a8d4e53..f211967636ee9da7396f3850e172dc6a28b12757 100644 (file)
--- a/src/backend/tracker.py
+++ b/src/backend/tracker.py
@@ -67,16 +67,6 @@ def bdecode(x):
         raise Exception("invalid bencoded value (data after valid prefix)")
     return r
 
-from types import StringType, IntType, LongType, DictType, ListType, TupleType
-
-
-class Bencached(object):
-
-    __slots__ = ['bencoded']
-
-    def __init__(self, s):
-        self.bencoded = s
-
 def encode_bencached(x,r):
     r.append(x.bencoded)
 
@@ -108,19 +98,12 @@ def encode_dict(x,r):
     r.append('e')
 
 encode_func = {}
-encode_func[Bencached] = encode_bencached
-encode_func[IntType] = encode_int
-encode_func[LongType] = encode_int
-encode_func[StringType] = encode_string
-encode_func[ListType] = encode_list
-encode_func[TupleType] = encode_list
-encode_func[DictType] = encode_dict
-
-try:
-    from types import BooleanType
-    encode_func[BooleanType] = encode_bool
-except ImportError:
-    pass
+encode_func[int] = encode_int
+encode_func[str] = encode_string
+encode_func[list] = encode_list
+encode_func[tuple] = encode_list
+encode_func[dict] = encode_dict
+encode_func[bool] = encode_bool
 
 def bencode(x):
     r = []