Fixing some hub issues found by pylint

[Mike McLean]

 hub/kojihub.py | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

[PATCH 1/7] fix a couple old typos found by pylint

[Mike McLean]

---
 hub/kojihub.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hub/kojihub.py b/hub/kojihub.py
index bea724d..0fa33e0 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -4951,7 +4951,7 @@ def old_image_data(old_image_id):
     ret = query.executeOne()
 
     if not ret:
-        raise koji.GenericError, 'no old image with ID: %i' % imageID
+        raise koji.GenericError, 'no old image with ID: %i' % old_image_id
     return ret
 
 def check_old_image_files(old):
@@ -7481,7 +7481,7 @@ class RootExports(object):
         elif md5sum is None:
             verify = None
         else:
-            verify, digest = info
+            verify, digest = md5sum
         sum_cls = get_verify_class(verify)
         if offset != -1:
             if size is not None:
-- 
1.9.3

[PATCH 2/7] fix useless-else-on-loop warnings #pylint

[Mike McLean]

---
 hub/kojihub.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hub/kojihub.py b/hub/kojihub.py
index 0fa33e0..3da3dc8 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -3896,8 +3896,8 @@ def get_archive_file(archive_id, filename):
     for file_info in files:
         if file_info['name'] == filename:
             return file_info
-    else:
-        return None
+    #otherwise
+    return None
 
 def list_task_output(taskID, stat=False):
     """List the files generated by the task with the given ID.  This
@@ -4875,11 +4875,11 @@ def get_archive_type(filename=None, type_name=None, type_id=None,
strict=False):
         elif len(results) > 1:
             # this should never happen, and is a misconfiguration in the database
             raise koji.GenericError, 'multiple matches for file extension: %s' %
ext
+    #otherwise
+    if strict:
+        raise koji.GenericError, 'unsupported file extension: %s' % ext
     else:
-        if strict:
-            raise koji.GenericError, 'unsupported file extension: %s' % ext
-        else:
-            return None
+        return None
 
 def new_maven_build(build, maven_info):
     """
-- 
1.9.3

[PATCH 3/7] actually raise intended exceptions #pylint

[Mike McLean]

---
 hub/kojihub.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hub/kojihub.py b/hub/kojihub.py
index 3da3dc8..cb99196 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -7671,7 +7671,7 @@ class RootExports(object):
         elif type == 'image':
             context.session.assertPerm('image-import')
         else:
-            koji.GenericError, 'unsupported archive type: %s' % type
+            raise koji.GenericError, 'unsupported archive type: %s' % type
         buildinfo = get_build(buildinfo, strict=True)
         fullpath = '%s/%s' % (koji.pathinfo.work(), filepath)
         import_archive(fullpath, buildinfo, type, typeInfo)
@@ -10282,7 +10282,7 @@ class HostExports(object):
             if not context.opts.get('EnableWin'):
                 raise koji.GenericError, 'Windows support not enabled'
         else:
-            koji.GenericError, 'unsupported archive type: %s' % type
+            raise koji.GenericError, 'unsupported archive type: %s' % type
         import_archive(filepath, buildinfo, type, typeInfo)
 
     def importWrapperRPMs(self, task_id, build_id, rpm_results):
-- 
1.9.3

[PATCH 4/7] import no longer used #pylint

[Mike McLean]

---
 hub/kojihub.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hub/kojihub.py b/hub/kojihub.py
index cb99196..aeae255 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -41,7 +41,6 @@ from koji.util import md5_constructor
 from koji.util import sha1_constructor
 from koji.util import dslice
 import os
-import random
 import re
 import rpm
 import shutil
-- 
1.9.3

[PATCH 5/7] fix comment #pylint

[Mike McLean]

---
 hub/kojihub.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hub/kojihub.py b/hub/kojihub.py
index aeae255..c315739 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -252,7 +252,7 @@ class Task(object):
         self.runCallbacks('postTaskStateChange', info, 'priority',
priority)
 
         if recurse:
-            """Change priority of child tasks"""
+            # Change priority of child tasks
             q = """SELECT id FROM task WHERE parent =
%(task_id)s"""
             for (child_id,) in _fetchMulti(q, locals()):
                 Task(child_id).setPriority(priority, recurse=True)
-- 
1.9.3

[PATCH 6/7] fix docstring #pylint

[Mike McLean]

---
 hub/kojihub.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hub/kojihub.py b/hub/kojihub.py
index c315739..a9a44dd 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -9394,7 +9394,7 @@ class RootExports(object):
         _dml(delete, locals())
 
     def _prepareSearchTerms(self, terms, matchType):
-        """Process the search terms before passing them to the database.
+        r"""Process the search terms before passing them to the database.
         If matchType is "glob", "_" will be replaced with
"\_" (to match literal
         underscores), "?" will be replaced with "_", and
"*" will
         be replaced with "%".  If matchType is "regexp", no changes
will be
-- 
1.9.3

[PATCH 7/7] more #pylint -- dangerous-default-value

[Mike McLean]

---
 hub/kojihub.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/hub/kojihub.py b/hub/kojihub.py
index a9a44dd..fb0acf4 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -708,8 +708,12 @@ def writeInheritanceData(tag_id, changes, clear=False):
         insert.make_create()
         insert.execute()
 
-def readFullInheritance(tag_id,event=None,reverse=False,stops={},jumps={}):
+def readFullInheritance(tag_id,event=None,reverse=False,stops=None,jumps=None):
     """Returns a list representing the full, ordered inheritance from
tag"""
+    if stops is None:
+        stops = {}
+    if jumps is None:
+        jumps = {}
     order = []
    
readFullInheritanceRecurse(tag_id,event,order,stops,{},{},0,None,False,[],reverse,jumps)
     return order
@@ -8369,7 +8373,11 @@ class RootExports(object):
         context.session.assertPerm('admin')
         return writeInheritanceData(tag,data,clear=clear)
 
-    def getFullInheritance(self,tag,event=None,reverse=False,stops={},jumps={}):
+    def getFullInheritance(self,tag,event=None,reverse=False,stops=None,jumps=None):
+        if stops is None:
+            stops = {}
+        if jumps is None:
+            jumps = {}
         if not isinstance(tag,int):
             #lookup tag id
             tag = get_tag_id(tag,strict=True)
-- 
1.9.3

[Ralph Bean]

On Wed, May 13, 2015 at 05:25:41PM -0400, Mike McLean wrote:
>   hub/kojihub.py | 37 ++++++++++++++++++++++---------------
>   1 file changed, 22 insertions(+), 15 deletions(-) 
Nice!  There were some good finds in there.

[Jon]

Agree. pylint++

On Thu, May 14, 2015 at 9:50 AM, Ralph Bean <rbean(a)redhat.com&gt; wrote:

>  On Wed, May 13, 2015 at 05:25:41PM -0400, Mike McLean wrote:
>  >  hub/kojihub.py | 37 ++++++++++++++++++++++---------------
>  >  1 file changed, 22 insertions(+), 15 deletions(-)
>
>  Nice!  There were some good finds in there.
>
>  --
>  buildsys mailing list
>  buildsys(a)lists.fedoraproject.org
>  https://admin.fedoraproject.org/mailman/listinfo/buildsys
>  


-- 

-Jon Disnard