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

[Leo Arias]

Refactored all the attributes to be lowercase, following pep8.

Still missing: arguments and internal variables

[Michael Terry (mterry)]

Noted a change that we don't want to make yet.

review: Needs Fixing

[lp:~elopio/snapcraft/fix1474022-lower_case2]

83. By Leo Arias on 2015-07-14

Revert the change of systemPackages.

[Leo Arias (elopio)]

done. Thanks for the review.

[Michael Terry (mterry)]

LGTM

review: Approve

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-07-13 16:26:54 +0000
+++ snapcraft/cmds.py	2015-07-14 04:42:01 +0000
@@ -181,16 +181,16 @@
             print("Installing required packages on the host system: " + ", ".join(newPackages))
             subprocess.call(['sudo', 'apt-get', 'install'] + newPackages, stdout=subprocess.DEVNULL)
 
-    for part in config.allParts:
+    for part in config.all_parts:
         for cmd in cmds:
             if cmd == 'stage':
                 # This ends up running multiple times, as each part gets to its
                 # staging cmd.  That's inefficient, but largely OK.
                 # FIXME: fix the above by iterating over cmds before iterating
-                # allParts.  But then we need to make sure we continue to handle
+                # all_parts.  But then we need to make sure we continue to handle
                 # cases like go, where you want go built before trying to pull
                 # a go project.
-                if not check_for_collisions(config.allParts):
+                if not check_for_collisions(config.all_parts):
                     sys.exit(1)
 
             snapcraft.common.env = config.build_env_for_part(part)

=== modified file 'snapcraft/plugin.py'
--- snapcraft/plugin.py	2015-07-13 16:15:03 +0000
+++ snapcraft/plugin.py	2015-07-14 04:42:01 +0000
@@ -29,10 +29,10 @@
         self.valid = False
         self.code = None
         self.config = None
-        self.partNames = []
+        self.part_names = []
         self.deps = []
-        self.pluginName = name
-        self.isLocalPlugin = False
+        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")
@@ -46,7 +46,7 @@
             localPluginDir = os.path.abspath(os.path.join('parts', 'plugins'))
             configPath = os.path.join(localPluginDir, name + ".yaml")
             if os.path.exists(configPath):
-                self.isLocalPlugin = True
+                self.is_local_plugin = True
             else:
                 # OK, now look at snapcraft's plugins
                 configPath = os.path.join(snapcraft.common.plugindir, name + ".yaml")
@@ -75,14 +75,14 @@
                 moduleName = self.config.get('module', name)
 
                 # Load code from local plugin dir if it is there
-                if self.isLocalPlugin:
+                if self.is_local_plugin:
                     sys.path = [localPluginDir] + sys.path
                 else:
                     moduleName = 'snapcraft.plugins.' + moduleName
 
                 module = importlib.import_module(moduleName)
 
-                if self.isLocalPlugin:
+                if self.is_local_plugin:
                     sys.path.pop(0)
 
                 for propName in dir(module):
@@ -91,14 +91,14 @@
                         self.code = prop(partName, options)
                         break
 
-        self.partNames.append(partName)
+        self.part_names.append(partName)
         self.valid = True
 
     def __str__(self):
-        return self.partNames[0]
+        return self.part_names[0]
 
     def __repr__(self):
-        return self.partNames[0]
+        return self.part_names[0]
 
     def makedirs(self):
         try:
@@ -126,10 +126,10 @@
         return self.valid
 
     def names(self):
-        return self.partNames
+        return self.part_names
 
     def notify_stage(self, stage, hint=''):
-        snapcraft.common.log(stage + " " + self.partNames[0] + hint)
+        snapcraft.common.log(stage + " " + self.part_names[0] + hint)
 
     def is_dirty(self, stage):
         try:
@@ -248,9 +248,9 @@
         return []
 
 
-def load_plugin(partName, pluginName, properties={}, loadCode=True):
-    part = Plugin(pluginName, partName, properties, loadCode=loadCode)
+def load_plugin(partName, plugin_name, properties={}, loadCode=True):
+    part = Plugin(plugin_name, partName, properties, loadCode=loadCode)
     if not part.is_valid():
-        snapcraft.common.log("Could not load part %s" % pluginName, file=sys.stderr)
+        snapcraft.common.log("Could not load part %s" % plugin_name, file=sys.stderr)
         sys.exit(1)
     return part

=== modified file 'snapcraft/plugins/ubuntu.py'
--- snapcraft/plugins/ubuntu.py	2015-07-13 16:15:03 +0000
+++ snapcraft/plugins/ubuntu.py	2015-07-14 04:42:01 +0000
@@ -25,25 +25,25 @@
 
     def __init__(self, name, options):
         super().__init__(name, options)
-        self.downloadablePackages = []
-        self.includedPackages = []
+        self.downloadable_packages = []
+        self.included_packages = []
         if options.package:
-            self.includedPackages.append(options.package)
+            self.included_packages.append(options.package)
         else:
             # User didn't specify a package, use the part name
             if name == 'ubuntu':
                 snapcraft.common.log("Part %s needs either a package option or a name" % name)
                 sys.exit(1)
-            self.includedPackages.append(name)
+            self.included_packages.append(name)
 
     def pull(self):
-        self.downloadablePackages = self.get_all_dep_packages(self.includedPackages)
-        return self.download_debs(self.downloadablePackages)
+        self.downloadable_packages = self.get_all_dep_packages(self.included_packages)
+        return self.download_debs(self.downloadable_packages)
 
     def build(self):
-        if not self.downloadablePackages:
-            self.downloadablePackages = self.get_all_dep_packages(self.includedPackages)
-        return self.unpack_debs(self.downloadablePackages, self.installdir)
+        if not self.downloadable_packages:
+            self.downloadable_packages = self.get_all_dep_packages(self.included_packages)
+        return self.unpack_debs(self.downloadable_packages, self.installdir)
 
     def snap_files(self):
         return (['*'], ['/usr/include', '/lib/*/*.a', '/usr/lib/*/*.a'])

=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-07-13 16:15:03 +0000
+++ snapcraft/yaml.py	2015-07-14 04:42:01 +0000
@@ -24,7 +24,7 @@
 
     def __init__(self):
         self.systemPackages = []
-        self.allParts = []
+        self.all_parts = []
         afterRequests = {}
 
         try:
@@ -37,7 +37,7 @@
         for partName in self.data.get("parts", []):
             properties = self.data["parts"][partName] or {}
 
-            pluginName = properties.get("plugin", partName)
+            plugin_name = properties.get("plugin", partName)
             if "plugin" in properties:
                 del properties["plugin"]
 
@@ -47,23 +47,23 @@
 
             # TODO: support 'filter' or 'blacklist' field to filter what gets put in snap/
 
-            self.load_plugin(partName, pluginName, properties)
+            self.load_plugin(partName, plugin_name, properties)
 
         localPlugins = set()
-        for part in self.allParts:
-            if part.isLocalPlugin:
-                localPlugins.add(part.pluginName)
+        for part in self.all_parts:
+            if part.is_local_plugin:
+                localPlugins.add(part.plugin_name)
         for localPlugin in localPlugins:
             snapcraft.common.log("Using local plugin %s" % localPlugin)
 
         # Grab all required dependencies, if not already specified
-        newParts = self.allParts.copy()
+        newParts = self.all_parts.copy()
         while newParts:
             part = newParts.pop(0)
             requires = part.config.get('requires', [])
             for requiredPart in requires:
                 alreadyPresent = False
-                for p in self.allParts:
+                for p in self.all_parts:
                     if requiredPart in p.names():
                         alreadyPresent = True
                         break
@@ -71,13 +71,13 @@
                     newParts.append(self.load_plugin(requiredPart, requiredPart, {}))
 
         # Gather lists of dependencies
-        for part in self.allParts:
+        for part in self.all_parts:
             depNames = part.config.get('requires', []) + afterRequests.get(part.names()[0], [])
             for dep in depNames:
                 foundIt = False
-                for i in range(len(self.allParts)):
-                    if dep in self.allParts[i].names():
-                        part.deps.append(self.allParts[i])
+                for i in range(len(self.all_parts)):
+                    if dep in self.all_parts[i].names():
+                        part.deps.append(self.all_parts[i])
                         foundIt = True
                         break
                 if not foundIt:
@@ -86,11 +86,11 @@
 
         # Now sort them (this is super inefficient, but easy-ish to follow)
         sortedParts = []
-        while self.allParts:
+        while self.all_parts:
             topPart = None
-            for part in self.allParts:
+            for part in self.all_parts:
                 mentioned = False
-                for other in self.allParts:
+                for other in self.all_parts:
                     if part in other.deps:
                         mentioned = True
                         break
@@ -101,14 +101,14 @@
                 snapcraft.common.log("Circular dependency chain!")
                 sys.exit(1)
             sortedParts = [topPart] + sortedParts
-            self.allParts.remove(topPart)
-        self.allParts = sortedParts
+            self.all_parts.remove(topPart)
+        self.all_parts = sortedParts
 
-    def load_plugin(self, partName, pluginName, properties, loadCode=True):
-        part = snapcraft.plugin.load_plugin(partName, pluginName, properties, loadCode=loadCode)
+    def load_plugin(self, partName, plugin_name, properties, loadCode=True):
+        part = snapcraft.plugin.load_plugin(partName, plugin_name, properties, loadCode=loadCode)
 
         self.systemPackages += part.config.get('systemPackages', [])
-        self.allParts.append(part)
+        self.all_parts.append(part)
         return part
 
     def runtime_env(self, root):
@@ -143,7 +143,7 @@
 
         env += self.runtime_env(root)
         env += self.build_env(root)
-        for part in self.allParts:
+        for part in self.all_parts:
             env += part.env(root)
 
         return env
@@ -153,7 +153,7 @@
         env = []
 
         env += self.runtime_env(root)
-        for part in self.allParts:
+        for part in self.all_parts:
             env += part.env(root)
 
         return env