Merge lp:~danilo/linaro-license-protection/pep8-cleanups into lp:~linaro-automation/linaro-license-protection/trunk

[Данило Шеган]

PEP8 cleanups.

[Stevan Radaković (stevanr)]

Looks good, thanks.
Approve +1.

review: Approve

=== modified file 'license_protected_downloads/render_text_files.py'
--- license_protected_downloads/render_text_files.py	2012-11-21 17:08:15 +0000
+++ license_protected_downloads/render_text_files.py	2012-11-29 10:18:21 +0000
@@ -76,8 +76,9 @@
         ubuntupaths = cls.dirEntries(path, files_list=settings.LINUX_FILES)
         if len(androidpaths) > 0 and len(ubuntupaths) > 0:
             # Files from ANDROID_FILES and LINUX_FILES exist in the same dir
-            raise MultipleFilesException("Both Android and Ubuntu HOWTO " \
-             "files are found, which is unsupported.")
+            raise MultipleFilesException(
+                "Both Android and Ubuntu HOWTO files "
+                "are found, which is unsupported.")
         else:
             if len(androidpaths) > 0:
                 return androidpaths

=== modified file 'license_protected_downloads/tests/helpers.py'
--- license_protected_downloads/tests/helpers.py	2012-11-28 12:08:35 +0000
+++ license_protected_downloads/tests/helpers.py	2012-11-29 10:18:21 +0000
@@ -39,4 +39,3 @@
             target.write(data)
             target.close()
             return full_path
-

=== modified file 'license_protected_downloads/tests/test_pep8.py'
--- license_protected_downloads/tests/test_pep8.py	2012-08-17 15:09:12 +0000
+++ license_protected_downloads/tests/test_pep8.py	2012-11-29 10:18:21 +0000
@@ -23,11 +23,8 @@
 
 class TestPep8(TestCase):
     def test_pep8(self):
-        # Errors we have to ignore for now:
-        #  * E202 whitespace before ')' or ']'
-        # E202 is actually only reported with the natty version of pep8 and
-        # can be re-enabled once we drop support for natty.
-        ignore = ['E202']
+        # Errors we have to ignore for now: use pep8 error codes like 'E202'.
+        ignore = []
         # Ignore return code.
         proc = subprocess.Popen(['pep8',
             '--repeat',

=== modified file 'license_protected_downloads/tests/test_views.py'
--- license_protected_downloads/tests/test_views.py	2012-11-28 12:08:35 +0000
+++ license_protected_downloads/tests/test_views.py	2012-11-29 10:18:21 +0000
@@ -32,6 +32,7 @@
     def tearDown(self):
         settings.SERVED_PATHS = self.old_served_paths
 
+
 class ViewTests(BaseServeViewTest):
     def test_license_directly(self):
         response = self.client.get('/licenses/license.html', follow=True)
@@ -528,7 +529,7 @@
         file_path = os.path.join(TESTSERVER_ROOT, target_file)
         os.chdir(file_path)
         ret = _process_include_tags(
-                    'Test <linaro:include file="README">README is missing' + \
+                    'Test <linaro:include file="README">README is missing'
                     '</linaro:include> html')
         self.assertEqual(ret, r"Test Included from README html")
         os.chdir(old_cwd)

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2012-10-23 09:34:56 +0000
+++ scripts/publish_to_snapshots.py	2012-11-29 10:18:21 +0000
@@ -106,8 +106,8 @@
     def validate_args(self, args):
         # Validate that all the required information
         # is passed on the command line
-        if (args.job_type == None or args.job_name == None or
-            args.build_num == None):
+        if (args.job_type is None or args.job_name is None or
+            args.build_num is None):
             raise PublisherArgumentException(
                 "\nYou must specify job-type, job-name and build-num")
 
@@ -138,7 +138,7 @@
     def validate_paths(self, args, uploads_path, target_path):
         build_dir_path = target_dir_path = None
         ret_val = self.jobname_to_target_subdir(args, args.job_name)
-        if ret_val != None:
+        if ret_val is not None:
             if args.job_type == "android":
                 build_path = '/'.join([args.job_type, args.job_name,
                                       str(args.build_num)])
@@ -220,7 +220,7 @@
             if os.path.islink(symlink_path):
                 os.unlink(symlink_path)
 
-            if  os.path.islink(header_symlink_path):
+            if os.path.islink(header_symlink_path):
                 os.unlink(header_symlink_path)
 
             os.symlink(header_path, header_symlink_path)
@@ -350,7 +350,7 @@
     try:
         build_dir_path, target_dir_path = publisher.validate_paths(
             args, uploads_path, target_path)
-        if build_dir_path == None or target_dir_path == None:
+        if build_dir_path is None or target_dir_path is None:
             print "Problem with build/target path, move failed"
             return FAIL
         ret = publisher.move_artifacts(args, build_dir_path, target_dir_path)

=== modified file 'settings.py'
--- settings.py	2012-10-24 09:44:06 +0000
+++ settings.py	2012-11-29 10:18:21 +0000
@@ -101,7 +101,7 @@
 ROOT_URLCONF = ROOT_DIR + '.urls'
 
 TEMPLATE_DIRS = (
-    os.path.join(PROJECT_ROOT, "templates" ),
+    os.path.join(PROJECT_ROOT, "templates"),
     )
 
 INSTALLED_APPS = (