[Rpm-maint] [PATCH] python: flake8 cleanups

Ville Skyttä ville.skytta at iki.fi
Sat Apr 5 11:48:56 UTC 2014


---
 python/rpm/__init__.py    | 18 ++++++++++++------
 python/rpm/transaction.py | 15 ++++++++++-----
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/python/rpm/__init__.py b/python/rpm/__init__.py
index 196be3c..3b750db 100644
--- a/python/rpm/__init__.py
+++ b/python/rpm/__init__.py
@@ -5,7 +5,6 @@ This module enables you to manipulate rpms and the rpm database.
 """
 
 import warnings
-import os
 from rpm._rpm import *
 from rpm.transaction import *
 import rpm._rpm as _rpm
@@ -32,10 +31,12 @@ except ImportError:
 # backwards compatibility + give the same class both ways
 ts = TransactionSet
 
+
 def headerLoad(*args, **kwds):
     warnings.warn("Use rpm.hdr() instead.", DeprecationWarning, stacklevel=2)
     return hdr(*args, **kwds)
 
+
 def _doHeaderListFromFD(rpm_fd, retrofit):
     hlist = []
     while 1:
@@ -49,17 +50,20 @@ def _doHeaderListFromFD(rpm_fd, retrofit):
 
     return hlist
 
-def readHeaderListFromFD(file_desc, retrofit = True):
+
+def readHeaderListFromFD(file_desc, retrofit=True):
     if not isinstance(file_desc, fd):
         file_desc = fd(file_desc)
     return _doHeaderListFromFD(file_desc, retrofit)
-        
-def readHeaderListFromFile(path, retrofit = True):
+
+
+def readHeaderListFromFile(path, retrofit=True):
     f = fd(path)
     hlist = _doHeaderListFromFD(f, retrofit)
     f.close()
     return hlist
-    
+
+
 def readHeaderFromFD(file_desc):
     if not isinstance(file_desc, fd):
         file_desc = fd(file_desc)
@@ -72,6 +76,7 @@ def readHeaderFromFD(file_desc):
 
     return (h, offset)
 
+
 def signalsCaught(siglist):
     caught = []
     for sig in siglist:
@@ -80,5 +85,6 @@ def signalsCaught(siglist):
 
     return caught
 
-def dsSingle(TagN, N, EVR = "", Flags = RPMSENSE_ANY):
+
+def dsSingle(TagN, N, EVR="", Flags=RPMSENSE_ANY):
     return ds((N, Flags, EVR), TagN)
diff --git a/python/rpm/transaction.py b/python/rpm/transaction.py
index db7ca67..35d7a15 100644
--- a/python/rpm/transaction.py
+++ b/python/rpm/transaction.py
@@ -9,6 +9,7 @@ if sys.version_info[0] == 3:
 else:
     _string_types = basestring,
 
+
 # TODO: migrate relevant documentation from C-side
 class TransactionSet(TransactionSetCore):
     _probFilter = 0
@@ -17,7 +18,7 @@ class TransactionSet(TransactionSetCore):
         oval = getattr(self, attr)
         setattr(self, attr, val)
         return oval
-        
+
     def setVSFlags(self, flags):
         return self._wrapSetGet('_vsflags', flags)
 
@@ -138,14 +139,18 @@ class TransactionSet(TransactionSetCore):
             needflags = rpm.RPMSENSE_ANY
             if len(needs) == 3:
                 needop = needs[1]
-                if needop.find('<') >= 0: needflags |= rpm.RPMSENSE_LESS
-                if needop.find('=') >= 0: needflags |= rpm.RPMSENSE_EQUAL
-                if needop.find('>') >= 0: needflags |= rpm.RPMSENSE_GREATER
+                if needop.find('<') >= 0:
+                    needflags |= rpm.RPMSENSE_LESS
+                if needop.find('=') >= 0:
+                    needflags |= rpm.RPMSENSE_EQUAL
+                if needop.find('>') >= 0:
+                    needflags |= rpm.RPMSENSE_GREATER
                 needver = needs[2]
             else:
                 needver = ""
 
-            res.append(((n, v, r),(needname,needver),needflags,sense,p.key))
+            res.append(((n, v, r),
+                        (needname, needver), needflags, sense, p.key))
 
         return res
 
-- 
1.9.0



More information about the Rpm-maint mailing list