Merge lp:~elopio/snapcraft/fix1474022-lower_case3 into lp:~snappy-dev/snapcraft/core

[Leo Arias]

Refactored all arguments to be lowercase, following pep8.

Still missing: internal variable names.

[Michael Terry (mterry)]

LGTM

review: Approve

[Snappy Tarmac (snappydevtarmac)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Michael Terry (mterry)]

Still looks fine.

review: Approve

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-07-14 04:42:49 +0000
+++ snapcraft/cmds.py	2015-07-14 04:42:49 +0000
@@ -30,8 +30,8 @@
         snapcraft.common.log("snapcraft.yaml already exists!", file=sys.stderr)
         sys.exit(1)
     yaml = 'parts:\n'
-    for partName in args.part:
-        part = snapcraft.plugin.load_plugin(partName, partName, loadCode=False)
+    for part_name in args.part:
+        part = snapcraft.plugin.load_plugin(part_name, part_name, load_code=False)
         yaml += '    ' + part.names()[0] + ':\n'
         for opt in part.config.get('options', []):
             if part.config['options'][opt].get('required', False):

=== modified file 'snapcraft/plugin.py'
--- snapcraft/plugin.py	2015-07-14 04:42:49 +0000
+++ snapcraft/plugin.py	2015-07-14 04:42:49 +0000
@@ -25,7 +25,7 @@
 
 class Plugin:
 
-    def __init__(self, name, partName, properties, optionsOverride=None, loadCode=True, loadConfig=True):
+    def __init__(self, name, part_name, properties, options_override=None, load_code=True, load_config=True):
         self.valid = False
         self.code = None
         self.config = None
@@ -34,14 +34,14 @@
         self.plugin_name = name
         self.is_local_plugin = False
 
-        self.sourcedir = os.path.join(os.getcwd(), "parts", partName, "src")
-        self.builddir = os.path.join(os.getcwd(), "parts", partName, "build")
-        self.installdir = os.path.join(os.getcwd(), "parts", partName, "install")
+        self.sourcedir = os.path.join(os.getcwd(), "parts", part_name, "src")
+        self.builddir = os.path.join(os.getcwd(), "parts", part_name, "build")
+        self.installdir = os.path.join(os.getcwd(), "parts", part_name, "install")
         self.stagedir = os.path.join(os.getcwd(), "stage")
         self.snapdir = os.path.join(os.getcwd(), "snap")
-        self.statefile = os.path.join(os.getcwd(), "parts", partName, "state")
+        self.statefile = os.path.join(os.getcwd(), "parts", part_name, "state")
 
-        if loadConfig:
+        if load_config:
             # First look in local path
             localPluginDir = os.path.abspath(os.path.join('parts', 'plugins'))
             configPath = os.path.join(localPluginDir, name + ".yaml")
@@ -55,7 +55,7 @@
                     return
             self.config = yaml.load(open(configPath, 'r')) or {}
 
-            if loadCode:
+            if load_code:
                 class Options():
                     pass
                 options = Options()
@@ -69,8 +69,8 @@
                                 snapcraft.common.log("Required field %s missing on part %s" % (opt, name), file=sys.stderr)
                                 return
                             setattr(options, opt, None)
-                if optionsOverride:
-                    options = optionsOverride
+                if options_override:
+                    options = options_override
 
                 moduleName = self.config.get('module', name)
 
@@ -88,10 +88,10 @@
                 for propName in dir(module):
                     prop = getattr(module, propName)
                     if issubclass(prop, snapcraft.BasePlugin):
-                        self.code = prop(partName, options)
+                        self.code = prop(part_name, options)
                         break
 
-        self.part_names.append(partName)
+        self.part_names.append(part_name)
         self.valid = True
 
     def __str__(self):
@@ -248,8 +248,8 @@
         return []
 
 
-def load_plugin(partName, plugin_name, properties={}, loadCode=True):
-    part = Plugin(plugin_name, partName, properties, loadCode=loadCode)
+def load_plugin(part_name, plugin_name, properties={}, load_code=True):
+    part = Plugin(plugin_name, part_name, properties, load_code=load_code)
     if not part.is_valid():
         snapcraft.common.log("Could not load part %s" % plugin_name, file=sys.stderr)
         sys.exit(1)

=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-07-14 04:42:49 +0000
+++ snapcraft/yaml.py	2015-07-14 04:42:49 +0000
@@ -34,20 +34,20 @@
             sys.exit(1)
         self.systemPackages = self.data.get('systemPackages', [])
 
-        for partName in self.data.get("parts", []):
-            properties = self.data["parts"][partName] or {}
+        for part_name in self.data.get("parts", []):
+            properties = self.data["parts"][part_name] or {}
 
-            plugin_name = properties.get("plugin", partName)
+            plugin_name = properties.get("plugin", part_name)
             if "plugin" in properties:
                 del properties["plugin"]
 
             if "after" in properties:
-                afterRequests[partName] = properties["after"]
+                afterRequests[part_name] = properties["after"]
                 del properties["after"]
 
             # TODO: support 'filter' or 'blacklist' field to filter what gets put in snap/
 
-            self.load_plugin(partName, plugin_name, properties)
+            self.load_plugin(part_name, plugin_name, properties)
 
         localPlugins = set()
         for part in self.all_parts:
@@ -104,8 +104,8 @@
             self.all_parts.remove(topPart)
         self.all_parts = sortedParts
 
-    def load_plugin(self, partName, plugin_name, properties, loadCode=True):
-        part = snapcraft.plugin.load_plugin(partName, plugin_name, properties, loadCode=loadCode)
+    def load_plugin(self, part_name, plugin_name, properties, load_code=True):
+        part = snapcraft.plugin.load_plugin(part_name, plugin_name, properties, load_code=load_code)
 
         self.systemPackages += part.config.get('systemPackages', [])
         self.all_parts.append(part)

=== modified file 'tests/unit/test_plugin.py'
--- tests/unit/test_plugin.py	2015-07-13 16:15:03 +0000
+++ tests/unit/test_plugin.py	2015-07-14 04:42:49 +0000
@@ -25,7 +25,7 @@
 class TestPlugin(unittest.TestCase):
 
     def test_is_dirty(self):
-        p = Plugin("mock", "mock-part", {}, loadConfig=False)
+        p = Plugin("mock", "mock-part", {}, load_config=False)
         p.statefile = tempfile.NamedTemporaryFile().name
         self.addCleanup(os.remove, p.statefile)
         p.code = mock.Mock()
@@ -38,7 +38,7 @@
         self.assertFalse(p.code.pull.called)
 
     def test_collect_snap_files(self):
-        p = Plugin("mock", "mock-part", {}, loadConfig=False)
+        p = Plugin("mock", "mock-part", {}, load_config=False)
 
         tmpdirObject = tempfile.TemporaryDirectory()
         self.addCleanup(tmpdirObject.cleanup)