Fix pylint errors.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/wizard/app/__init__.py b/wizard/app/__init__.py
index 1fc1669461c5d0b608b3cbc046e9833354182e82..b4ffe47c6fe9fbc8a66d898c03c4db21e4d05884 100644 (file)
--- a/wizard/app/__init__.py
+++ b/wizard/app/__init__.py
@@ -20,9 +20,11 @@ import re
 import distutils.version
 import decorator
 import shlex
+import logging
+import shutil
 
 import wizard
-from wizard import scripts, shell, util
+from wizard import app, resolve, scripts, shell, util
 
 _application_list = [
     "mediawiki", "wordpress", "joomla", "e107", "gallery2",

diff --git a/wizard/app/mediawiki.py b/wizard/app/mediawiki.py
index c5b6f3efd6b52ff0c6a4c73b9e0cc36e9fbdee6a..5e71b4dc39dd25174f7e3d746457c40e9cd0252f 100644 (file)
--- a/wizard/app/mediawiki.py
+++ b/wizard/app/mediawiki.py
@@ -31,11 +31,8 @@ class Application(app.Application):
     extractors.update(php.extractors)
     substitutions = app.make_substitutions(seed)
     substitutions.update(php.substitutions)
-    @property
-    def install_handler(self):
-        handler = install.ArgHandler("mysql", "admin", "email")
-        handler.add(install.Arg("title", help="Title of your new MediaWiki install"))
-        return handler
+    install_handler = install.ArgHandler("mysql", "admin", "email")
+    install_handler.add(install.Arg("title", help="Title of your new MediaWiki install"))
     def checkConfig(self, deployment):
         return os.path.isfile(os.path.join(deployment.location, "LocalSettings.php"))
     def detectVersion(self, deployment):

diff --git a/wizard/command/errors.py b/wizard/command/errors.py
index 08fd76ee538678d3fb0e9c3192f7aa51a6170c33..10be7aa44a12e7722eaa78e05105318e9996a522 100644 (file)
--- a/wizard/command/errors.py
+++ b/wizard/command/errors.py
@@ -12,7 +12,7 @@ def main(argv, baton):
         if options.verbose:
             if isinstance(e, app.NoSuchApplication):
                 print "Application %s does not exist, at %s" % (e.app, e.location)
-            elif isinstance(e, deploy.DeploymentParseError):
+            elif isinstance(e, app.DeploymentParseError):
                 print "Parse error for line '%s', at %s" % (e.value, e.location)
             else:
                 raise e

diff --git a/wizard/resolve.py b/wizard/resolve.py
index 910802f8cbb3cc40be307ef2671ef3e1aee6f11a..9259c245330c5d90140527f867d2ab65fa37cc17 100644 (file)
--- a/wizard/resolve.py
+++ b/wizard/resolve.py
@@ -59,6 +59,7 @@ then the user matched globs.
 
 import re
 import itertools
+import logging
 
 re_var = re.compile("^\*\*\*(\d+)\*\*\*\\\n", re.MULTILINE)