PEP8 cleanup

bobwenx · Feb 22, 2014 · 5bf4931 · 5bf4931
1 parent cae361b
commit 5bf4931
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/mackup/config.py b/mackup/config.py
@@ -11,7 +11,8 @@
                        ENGINE_GDRIVE,
                        ENGINE_FS)
 
-from utils import (get_dropbox_folder_location,
+from utils import (error,
+                   get_dropbox_folder_location,
                    get_google_drive_folder_location)
 
 try:
@@ -112,18 +113,18 @@ def _warn_on_old_config(self):
         old_sections = ['Allowed Applications', 'Ignored Applications']
         for old_section in old_sections:
             if self._parser.has_section(old_section):
-                utils.error("Old config file detected. Aborting.\n"
-                            "\n"
-                            "An old section (e.g. [Allowed Applications]"
-                            " or [Ignored Applications] has been detected"
-                            " in your {} file.\n"
-                            "I'd rather do nothing than do something you"
-                            " do not want me to do.\n"
-                            "\n"
-                            "Please read the up to date documentation on"
-                            " <https://github.com/lra/mackup> and migrate"
-                            " your configuration file."
-                            .format(path_to_cfg))
+                error("Old config file detected. Aborting.\n"
+                      "\n"
+                      "An old section (e.g. [Allowed Applications]"
+                      " or [Ignored Applications] has been detected"
+                      " in your {} file.\n"
+                      "I'd rather do nothing than do something you"
+                      " do not want me to do.\n"
+                      "\n"
+                      "Please read the up to date documentation on"
+                      " <https://github.com/lra/mackup> and migrate"
+                      " your configuration file."
+                      .format(MACKUP_CONFIG_FILE))
 
     def _parse_engine(self):
         """
@@ -156,8 +157,8 @@ def _parse_path(self):
                 cfg_path = self._parser.get('storage', 'path')
                 path = os.path.join(os.environ['HOME'], cfg_path)
             else:
-                raise ConfigError("The required 'path' can't be found while the"
-                                  " 'file_system' engine is used.")
+                raise ConfigError("The required 'path' can't be found while"
+                                  " the 'file_system' engine is used.")
 
         return str(path)
 

diff --git a/mackup/mackup.py b/mackup/mackup.py
@@ -8,7 +8,6 @@
 import shutil
 import tempfile
 
-from . import constants
 from . import utils
 from . import config
 

diff --git a/mackup/utils.py b/mackup/utils.py
@@ -198,8 +198,8 @@ def parse_cmdline_args():
 
     # Format some epilog text
     epilog = ("Mackup modes of action:\n"
-              " - backup: sync your conf files to your synced storage, use this"
-              " the 1st time you use Mackup.\n"
+              " - backup: sync your conf files to your synced storage, use"
+              " this the 1st time you use Mackup.\n"
               " - restore: link the conf files already in your synced storage"
               " on your system, use it on any new system you use.\n"
               " - uninstall: reset everything as it was before using Mackup.\n"

diff --git a/tests/config_tests.py b/tests/config_tests.py
@@ -5,7 +5,6 @@
                               ENGINE_GDRIVE,
                               ENGINE_FS)
 from mackup.config import Config, ConfigError
-from mackup import utils
 
 
 class TestConfig(unittest.TestCase):
@@ -14,7 +13,6 @@ def setUp(self):
         realpath = os.path.dirname(os.path.realpath(__file__))
         os.environ['HOME'] = os.path.join(realpath, 'fixtures')
 
-
     def test_config_empty(self):
         cfg = Config('mackup-empty.cfg')