Fix python 3 issues.

src/seedboxtools/__init__.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python
 
-__version__ = '1.4.5'
+__version__ = '1.4.6'

src/seedboxtools/clients.py

@@ -349,22 +349,22 @@ def _upload(self, **params):
         if r.status_code == 500:
             raise TemporaryMalfunction(
                 "Server is experiencing a temporary 500 status code: %s"%\
-                r.content
+                r.text
             )
         if r.status_code == 404:
             raise Misconfiguration(
                 "Server address (%s) is likely misconfigured: %s"%\
                 self.hostname
             )
-        if 'addTorrentSuccess' in r.content:
+        if 'addTorrentSuccess' in r.text:
             return
-        elif 'addTorrentFailed' in r.content:
+        elif 'addTorrentFailed' in r.text:
             if "data" in params:
                 raise InvalidTorrent(params['data']['url'])
             else:
                 raise InvalidTorrent(params['files']['torrent_file'][0])
         else:
-            assert 0, (r.status_code, r.content)
+            assert 0, (r.status_code, r.text)
 
     def remove_remote_download(self, filename):
         # in this implementation, get_finished_torrents MUST BE called first

src/seedboxtools/uploader.py

@@ -14,7 +14,6 @@ def main():
         util.report_error("Cannot load configuration (%s) -- run configleecher first" % (e))
         sys.exit(7)
     cfg = config.load_config(config_fobject)
-    local_download_dir = cfg.general.local_download_dir
     client = config.get_client(cfg)
 
     # separate the wheat from the chaff
@@ -27,7 +26,10 @@ def main():
     for uploadable in args.torrents:
         try:
             if type(uploadable) is str:
-                uploadable = uploadable.decode(sys.getfilesystemencoding())
+                try:
+                    uploadable = uploadable.decode(sys.getfilesystemencoding())
+                except AttributeError:
+                    pass
             if is_magnet(uploadable):
                 client.upload_magnet_link(uploadable)
                 util.report_message("%s submitted to seedbox" % uploadable)