Pylinted

Change-Id: I97f7536c132d74224783b70116857dcc0b6bc6e2
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>

diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py
index c1b020bb293fa42806fdcd1744cfd85eb9bc8fce..0790f87ad279b94895ee776f2a8e76340a61d2fc 100644 (file)
--- a/gitbuildsys/cmd_export.py
+++ b/gitbuildsys/cmd_export.py
@@ -246,7 +246,8 @@ def main(args):
     else:
         commit = 'HEAD'
     packaging_dir = get_packaging_dir(args)
-    main_spec, rest_specs = utils.guess_spec(workdir, packaging_dir, args.spec, commit)
+    main_spec, rest_specs = utils.guess_spec(workdir, packaging_dir,
+                                             args.spec, commit)
 
     if args.outdir:
         outdir = args.outdir
@@ -272,7 +273,7 @@ def main(args):
         # also update other spec files if no --spec option specified
         if not args.spec and rest_specs:
             # backup updated spec file
-            specbakd = utils.Temp(prefix=os.path.join(tmpdir, '.gbs_export_'),\
+            specbakd = utils.Temp(prefix=os.path.join(tmpdir, '.gbs_export_'),
                                directory=True)
             shutil.copy(os.path.join(export_dir,
                         os.path.basename(main_spec)), specbakd.path)

diff --git a/gitbuildsys/cmd_remotebuild.py b/gitbuildsys/cmd_remotebuild.py
index 9dc7fca46773ee876039574bbd69a8c9ab7d5038..173d628899cb7a008e91d8b9a6859039877c8eef 100644 (file)
--- a/gitbuildsys/cmd_remotebuild.py
+++ b/gitbuildsys/cmd_remotebuild.py
@@ -93,7 +93,8 @@ def main(args):
     else:
         commit = 'HEAD'
 
-    relative_spec = utils.guess_spec(workdir, packaging_dir, args.spec, commit)[0]
+    relative_spec = utils.guess_spec(workdir, packaging_dir,
+                                     args.spec, commit)[0]
 
     if args.include_all:
         # include_all means to use work copy,
@@ -216,8 +217,8 @@ def main(args):
             if not build_repos:
                 log.warning("no available build repos for %s" % target_prj)
         if api.exists(target_prj, package):
-            old, _not_changed, changed, new = api.diff_files(target_prj,
-                                                             package, files)
+            _old, _not_changed, changed, new = api.diff_files(target_prj,
+                                                              package, files)
             commit_files = changed + new
         else:
             log.info('creating new package %s/%s' % (target_prj, package))

diff --git a/gitbuildsys/utils.py b/gitbuildsys/utils.py
index b838f134a1c0e1280cc1138282cdf2626f40bde8..33b2fac87efd1173adc94e87bcf1541396362efb 100644 (file)
--- a/gitbuildsys/utils.py
+++ b/gitbuildsys/utils.py
@@ -61,13 +61,13 @@ def guess_spec(git_path, packaging_dir, given_spec, commit_id='WC.UNTRACKED'):
     git_path = os.path.abspath(git_path)
 
     if commit_id == 'WC.UNTRACKED':
-        check = lambda fname, dir_only=False: os.path.exists(os.path.join( \
+        check = lambda fname, dir_only = False: os.path.exists(os.path.join(
                        git_path, fname))
         glob_ = lambda pattern: [ name.replace(git_path+'/', '')
             for name in glob.glob(os.path.join(git_path, pattern)) ]
         msg = 'No such spec file %s'
     else:
-        check = lambda fname, dir_only=False : file_exists_in_rev(git_path, \
+        check = lambda fname, dir_only = False : file_exists_in_rev(git_path,
                        fname, commit_id, dir_only=dir_only)
         glob_ = lambda pattern: glob_in_rev(git_path, pattern, commit_id)
         msg = "No such spec file %%s in %s" % commit_id
@@ -488,7 +488,8 @@ def show_file_from_rev(git_path, relative_path, commit_id):
     args = ['git', 'show', '%s:%s' % (commit_id, relative_path)]
     try:
         with Workdir(git_path):
-            return  subprocess.Popen(args, stdout=subprocess.PIPE).communicate()[0]
+            return  subprocess.Popen(args,
+                                     stdout=subprocess.PIPE).communicate()[0]
     except (subprocess.CalledProcessError, OSError), err:
         log.debug('failed to checkout %s from %s:%s' % (relative_path,
                                                         commit_id, str(err)))
@@ -499,13 +500,14 @@ def file_exists_in_rev(git_path, relative_path, commit_id, dir_only=False):
     """Check if file exists in given given revision."""
     git_opts = ['--name-only']
     if dir_only:
-       git_opts += ['-d']
+        git_opts += ['-d']
     args = ['git', 'ls-tree', commit_id, relative_path]
     args.extend(git_opts)
 
     try:
         with Workdir(git_path):
-            output = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()[0]
+            output = subprocess.Popen(args,
+                                      stdout=subprocess.PIPE).communicate()[0]
     except (subprocess.CalledProcessError, OSError), err:
         raise GbsError('failed to check existence of %s in %s:%s' % (
             relative_path, commit_id, str(err)))
@@ -521,7 +523,8 @@ def glob_in_rev(git_path, pattern, commit_id):
 
     try:
         with Workdir(git_path):
-            output = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()[0]
+            output = subprocess.Popen(args,
+                                      stdout=subprocess.PIPE).communicate()[0]
     except (subprocess.CalledProcessError, OSError), err:
         raise GbsError('failed to glob %s in %s:%s' % (
             pattern, commit_id, str(err)))

diff --git a/setup.py b/setup.py
index 5870619e821f8c55f65ebd0d7115486441a51811..6d9e06fdbce3132994e51c5b46ac7115663f9a42 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,17 +3,10 @@
 """GBS setup."""
 
 import os, sys
-import glob
 import re
 
 from distutils.core import setup
 
-try:
-    import setuptools
-    # enable "setup.py develop", optional
-except ImportError:
-    pass
-
 MOD_NAME = 'gitbuildsys'
 
 def get_version(mod_name):