Code cosmetics

autopep8 + isort

locale/pavement.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import division, print_function, unicode_literals
-from __future__ import absolute_import
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
-from future import standard_library
-standard_library.install_aliases()
 import fnmatch
 import io
 import os
@@ -15,9 +13,13 @@
 from subprocess import Popen, call
 from tempfile import mkdtemp
 
+from future import standard_library
+
 from paver.easy import *
 from pyload import info
 
+standard_library.install_aliases()
+
 
 # patch to let it support list of patterns
 

pyLoad.py

@@ -10,23 +10,25 @@
 #          \  /
 #           \/
 
-from __future__ import print_function, unicode_literals
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
-from future import standard_library
-standard_library.install_aliases()
 import argparse
 # from multiprocessing import freeze_support
 import operator
 import os
 import sys
 from builtins import PACKDIR, map
 
+from future import standard_library
+
 import pyload
 from pyload.utils import format
 from pyload.utils.sys import set_console_icon, set_console_title
 
+standard_library.install_aliases()
+
+
 try:
     import colorama
 except ImportError:

pyload/__init__.py

@@ -9,16 +9,14 @@
 #          \  /
 #           \/
 
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
-from builtins import int
 import builtins
 import codecs
 import os
 import tempfile
+from builtins import int
 
 import daemonize
 import psutil
@@ -52,7 +50,6 @@
 sys.path.append(PACKDIR)
 sys.path.append(USERDIR)
 
-# import codecs
 # codecs.register(lambda name: codecs.lookup('utf-8') if name == 'cp65001' else None)
 writer = codecs.getwriter(sys.console_encoding(sys.stdout.encoding))
 sys.stdout = writer(sys.stdout, errors="replace")

pyload/api/__init__.py

@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
 #@author: RaNaN
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from future import standard_library
-standard_library.install_aliases()
-from builtins import str
-from builtins import object
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+
 import re
-from types import MethodType
+from builtins import object, str
 
+from future import standard_library
+
+from pyload.datatype import User
 from pyload.remote.apitypes import *
+from types import MethodType
+
+standard_library.install_aliases()
+
 
 # contains function names mapped to their permissions
 # unlisted functions are for admins only
@@ -48,8 +50,6 @@ def __new__(cls, func, *args, **kwargs):
 def state_string(state):
     return ",".join(str(x) for x in state_map[state])
 
-from pyload.datatype import User
-
 
 class Api(Iface):
     """

pyload/api/account.py

@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-from __future__ import print_function
-from __future__ import division
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 from future import standard_library
-standard_library.install_aliases()
+
 from pyload.api import Api, Permission, require_perm
 from pyload.api.base import BaseApi
 from pyload.utils.convert import to_bool
 
+standard_library.install_aliases()
+
 
 class AccountApi(BaseApi):
     """

pyload/api/addon.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-from __future__ import print_function
-from __future__ import division
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 from future import standard_library
-standard_library.install_aliases()
+
 from pyload.api import Api, Permission, require_perm
 from pyload.api.base import BaseApi
 
+standard_library.install_aliases()
+
 
 # TODO: multi user
 class AddonApi(BaseApi):

pyload/api/base.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 from future import standard_library
-standard_library.install_aliases()
+
 from pyload.remote.apitypes import Iface
 
+standard_library.install_aliases()
+
 # Workaround to let code-completion think, this is subclass of Iface
 Iface = object
 

pyload/api/config.py

@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-from __future__ import print_function
-from __future__ import division
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 from future import standard_library
-standard_library.install_aliases()
+
 from pyload.api import (Api, ConfigHolder, ConfigInfo, ConfigItem, Permission,
                         require_perm)
 from pyload.api.base import BaseApi
 from pyload.utils.convert import to_str
 
+standard_library.install_aliases()
+
 
 # helper function to create a ConfigHolder
 

pyload/api/core.py

@@ -1,17 +1,18 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-from __future__ import print_function
-from __future__ import division
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
-from future import standard_library
-standard_library.install_aliases()
 import io
 import os
 
+from future import standard_library
+
 from pyload.api import Api, Interaction, Permission, StatusInfo, require_perm
 from pyload.api.base import BaseApi
 
+standard_library.install_aliases()
+
 
 class CoreApi(BaseApi):
     """

pyload/api/download.py

@@ -1,18 +1,19 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-from __future__ import print_function
-from __future__ import division
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
-from future import standard_library
-standard_library.install_aliases()
 import io
 import os
 from builtins import str
 
+from future import standard_library
+
 from pyload.api import Api, Permission, Role, require_perm
 from pyload.api.base import BaseApi
 
+standard_library.install_aliases()
+
 
 class DownloadApi(BaseApi):
     """

pyload/api/file.py

@@ -1,17 +1,18 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-from __future__ import print_function
-from __future__ import division
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 from future import standard_library
-standard_library.install_aliases()
+
 from pyload.api import PackageStatus as PS
 from pyload.api import (Api, DownloadState, FileDoesNotExist,
                         PackageDoesNotExist, Permission, require_perm)
 from pyload.api.base import BaseApi
 from pyload.utils.purge import uniqify
 
+standard_library.install_aliases()
+
 
 # TODO: user context
 class FileApi(BaseApi):

pyload/api/interaction.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-from __future__ import print_function
-from __future__ import division
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 from future import standard_library
-standard_library.install_aliases()
+
 from pyload.api import Api, Interaction, Permission, require_perm
 from pyload.api.base import BaseApi
 
+standard_library.install_aliases()
+
 
 class UserInteractionApi(BaseApi):
     """

pyload/api/predownload.py

@@ -1,16 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-from __future__ import print_function
-from __future__ import division
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
-from future import standard_library
-standard_library.install_aliases()
 import io
 import os
 from builtins import str
 from itertools import chain
 
+from future import standard_library
+
 from pyload.api import DownloadStatus as DS
 from pyload.api import (Api, LinkStatus, OnlineCheck, Permission, require_perm,
                         urlmatcher)
@@ -19,6 +18,8 @@
 from pyload.utils.packagetools import parse_names
 from pyload.utils.purge import uniqify
 
+standard_library.install_aliases()
+
 
 class PreDownloadApi(BaseApi):
     """

pyload/api/stat.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-from __future__ import print_function
-from __future__ import division
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 from future import standard_library
-standard_library.install_aliases()
+
 from pyload.api import Api
 from pyload.api.base import BaseApi
 
+standard_library.install_aliases()
+
 CACHE = {}
 QUOTA_UNLIMITED = -1
 

pyload/api/user.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-from __future__ import print_function
-from __future__ import division
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 from future import standard_library
-standard_library.install_aliases()
+
 from pyload.api import Api, Permission, require_perm
 from pyload.api.base import BaseApi
 
+standard_library.install_aliases()
+
 
 class UserApi(BaseApi):
     """

pyload/config/__init__.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+
 from future import standard_library
-standard_library.install_aliases()
+
 from pyload.config import Config
-from pyload.config.parser import Section
 from pyload.config.default import make_config
+from pyload.config.parser import Section
+
+standard_library.install_aliases()