Code cosmetics

5 files changed, 7 insertions, 7 deletions

diff --git a/module/plugins/internal/Account.py b/module/plugins/internal/Account.py
index 27525e1d2..96f1cb533 100644
--- a/module/plugins/internal/Account.py
+++ b/module/plugins/internal/Account.py
@@ -206,7 +206,7 @@ class Account(Plugin):
 
     def load_account_info(self, name, req=None):
         """
-        This should be overwritten in account plugin,\
+        This should be overwritten in account plugin
         and retrieving account information for user
 
         :param name:
diff --git a/module/plugins/internal/Crypter.py b/module/plugins/internal/Crypter.py
index 034224b4e..627c198e1 100644
--- a/module/plugins/internal/Crypter.py
+++ b/module/plugins/internal/Crypter.py
@@ -13,7 +13,7 @@ class Crypter(Hoster):
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
-    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides core.config.get("general", "folder_per_package")
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),  #: Overrides pyload.config.get("general", "folder_per_package")
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """Base decrypter plugin"""
diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py
index af3e80acf..ffd7c4ecc 100644
--- a/module/plugins/internal/Hoster.py
+++ b/module/plugins/internal/Hoster.py
@@ -83,7 +83,7 @@ class Hoster(Plugin):
         self.ocr = None
 
         #: Account handler instance, see :py:class:`Account`
-        self.account = pyfile.m.core.accountManager.getAccountPlugin(self.__name__)
+        self.account = self.pyload.accountManager.getAccountPlugin(self.__name__)
 
         #: Premium status
         self.premium = False
@@ -107,7 +107,7 @@ class Hoster(Plugin):
             #: Premium status
             self.premium = self.account.is_premium(self.user)
         else:
-            self.req = pyfile.m.core.requestFactory.getRequest(self.__name__)
+            self.req = self.pyload.requestFactory.getRequest(self.__name__)
 
         #: Associated pyfile instance, see `PyFile`
         self.pyfile = pyfile
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 0e54c30a4..efda7dc1a 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -14,7 +14,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
-    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),  #: Overrides core.config['general']['folder_per_package']
+    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),  #: Overrides pyload.config['general']['folder_per_package']
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """Simple decrypter plugin"""
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 03b19bcf9..1a2e64b94 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -37,7 +37,7 @@ class UnRar(Extractor):
     EXTENSIONS = [".rar"]
 
 
-    re_multipart = re.compile(r'\.(part|r)(\d+)(?:\.rar)?(\.rev|\.bad)?',re.I)
+    re_multipart = re.compile(r'\.(part|r)(\d+)(?:\.rar)?(\.rev|\.bad)?', re.I)
 
     re_filefixed = re.compile(r'Building (.+)')
     re_filelist  = re.compile(r'^(.)(\s*[\w\.\-]+)\s+(\d+\s+)+(?:\d+\%\s+)?[\d\-]{8}\s+[\d\:]{5}', re.M|re.I)
@@ -180,7 +180,7 @@ class UnRar(Extractor):
 
         #: eventually Multipart Files
         files.extend(fs_join(dir, os.path.basename(file)) for file in filter(self.is_multipart, os.listdir(dir))
-                     if re.sub(self.re_multipart,".rar",name) == re.sub(self.re_multipart,".rar",file))
+                     if re.sub(self.re_multipart, ".rar", name) == re.sub(self.re_multipart, ".rar", file))
 
         return files