Make pep8 tests run against the library directory as well, and associated tweaks…

Make pep8 tests run against the library directory as well, and associated tweaks (mostly to indentation) in the library
directory.

Makefile

@@ -71,7 +71,8 @@ pep8:
 	@echo "#############################################"
 	@echo "# Running PEP8 Compliance Tests"
 	@echo "#############################################"
-	pep8 -r --ignore=E501,E221,W291,W391,E302,E251,E203,W293,E231,E303,E201,E225,E261 lib/ bin/
+	-pep8 -r --ignore=E501,E221,W291,W391,E302,E251,E203,W293,E231,E303,E201,E225,E261 lib/ bin/
+	-pep8 -r --ignore=E501,E221,W291,W391,E302,E251,E203,W293,E231,E303,E201,E225,E261 --filename "*" library/
 
 pyflakes:
 	pyflakes lib/ansible/*.py bin/*

library/apt

@@ -21,7 +21,7 @@
 
 import traceback
 # added to stave off future warnings about apt api
-import warnings;
+import warnings
 warnings.filterwarnings('ignore', "apt API not stable yet", FutureWarning)
 
 # APT related constants
@@ -30,8 +30,7 @@ APT = "DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical %s" % APT_PATH
 
 def run_apt(command):
     try:
-        cmd = subprocess.Popen(command, shell=True,
-            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        cmd = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         out, err = cmd.communicate()
     except (OSError, IOError), e:
         rc = 1
@@ -131,7 +130,8 @@ def main():
     )
 
     try:
-        import apt, apt_pkg
+        import apt
+        import apt_pkg
     except:
         module.fail_json("Could not import python modules: apt, apt_pkg. Please install python-apt package.")
 

library/async_status

@@ -58,7 +58,7 @@ def main():
             module_fail_json(ansible_job_id=jid, results_file=log_path,
                 msg="Could not parse job output: %s" % data)
 
-    if not data.has_key("started"):
+    if not 'started' in data:
         data['finished'] = 1
         data['ansible_job_id'] = jid
     module.exit_json(**data)

library/file

@@ -113,13 +113,6 @@ def selinux_context(path):
     return context
 
 # ===========================================
-
-
-
-
-
-
-# ===========================================
 # support functions
 
 def user_and_group(filename):
@@ -222,7 +215,9 @@ def rmtree_error(func, path, exc_info):
 
 def main():
 
+    # FIXME: pass this around, should not use global
     global module
+
     module = AnsibleModule(
         check_invalid_arguments = False,
         argument_spec = dict(

library/mount

@@ -147,9 +147,9 @@ def mount(**kwargs):
 
     name = kwargs['name']
     if os.path.ismount(name):
-        cmd = ['/bin/mount', '-o', 'remount', name]
+        cmd = [ '/bin/mount', '-o', 'remount', name ]
     else:
-        cmd = ['/bin/mount', name ]
+        cmd = [ '/bin/mount', name ]
 
     call = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, err = call.communicate()

library/service

@@ -207,11 +207,9 @@ def main():
     if state:
         result['state'] = state
     rc, stdout, stderr = _run("%s %s status" % (SERVICE, name))
-    module.exit_json(**result);
-
+    module.exit_json(**result)
 
 # this is magic, see lib/ansible/module_common.py
 #<<INCLUDE_ANSIBLE_MODULE_COMMON>>
 
 main()
-

library/setup

@@ -130,7 +130,7 @@ class Facts(object):
                 self.facts['selinux']['policyvers'] = 'unknown'
             try:
                 (rc, configmode) = selinux.selinux_getenforcemode()
-                if rc == 0 and Facts.SELINUX_MODE_DICT.has_key(configmode):
+                if rc == 0 and configmode in Facts.SELINUX_MODE_DICT:
                     self.facts['selinux']['config_mode'] = Facts.SELINUX_MODE_DICT[configmode]
                 else:
                     self.facts['selinux']['config_mode'] = 'unknown'
@@ -138,7 +138,7 @@ class Facts(object):
                 self.facts['selinux']['config_mode'] = 'unknown'
             try:
                 mode = selinux.security_getenforce()
-                if Facts.SELINUX_MODE_DICT.has_key(mode):
+                if mode in Facts.SELINUX_MODE_DICT:
                     self.facts['selinux']['mode'] = Facts.SELINUX_MODE_DICT[mode]
                 else:
                     self.facts['selinux']['mode'] = 'unknown'
@@ -196,19 +196,21 @@ class LinuxHardware(Hardware):
 
     In addition, it also defines number of DMI facts.
     """
+
     platform = 'Linux'
     MEMORY_FACTS = ['MemTotal', 'SwapTotal', 'MemFree', 'SwapFree']
     # DMI bits
-    DMI_DICT = { 'form_factor':  '/sys/devices/virtual/dmi/id/chassis_type',
-                 'product_name': '/sys/devices/virtual/dmi/id/product_name',
-                 'product_serial': '/sys/devices/virtual/dmi/id/product_serial',
-                 'product_uuid': '/sys/devices/virtual/dmi/id/product_uuid',
-                 'product_version': '/sys/devices/virtual/dmi/id/product_version',
-                 'system_vendor': '/sys/devices/virtual/dmi/id/sys_vendor',
-                 'bios_date': '/sys/devices/virtual/dmi/id/bios_date',
-                 'bios_version': '/sys/devices/virtual/dmi/id/bios_version' }
-    # From smolt and DMI spec
-    # See http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.0.pdf
+    DMI_DICT = dict(
+        form_factor     =  '/sys/devices/virtual/dmi/id/chassis_type',
+        product_name    = '/sys/devices/virtual/dmi/id/product_name',
+        product_serial  = '/sys/devices/virtual/dmi/id/product_serial',
+        product_uuid    = '/sys/devices/virtual/dmi/id/product_uuid',
+        product_version = '/sys/devices/virtual/dmi/id/product_version',
+        system_vendor   = '/sys/devices/virtual/dmi/id/sys_vendor',
+        bios_date       = '/sys/devices/virtual/dmi/id/bios_date',
+        bios_version    = '/sys/devices/virtual/dmi/id/bios_version'
+    )
+    # DMI SPEC -- http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.0.pdf
     FORM_FACTOR = [ "Unknown", "Other", "Unknown", "Desktop",
                     "Low Profile Desktop", "Pizza Box", "Mini Tower", "Tower",
                     "Portable", "Laptop", "Notebook", "Hand Held", "Docking Station",
@@ -683,4 +685,3 @@ def main():
 # this is magic, see lib/ansible/module_common.py
 #<<INCLUDE_ANSIBLE_MODULE_COMMON>>
 main()
-