Various style fixes

Signed-off-by: Chris Warrick <[email protected]>

localeprovider.py

@@ -1,5 +1,5 @@
 # A module only for gettext locale provision.
-translationcheat = _('usage') +
-                   _('positional arguments') +
-                   _('optional arguments') +
-                   _('show this help message and exit')
+translationcheat = (_('usage') +
+                    _('positional arguments') +
+                    _('optional arguments') +
+                    _('show this help message and exit'))

pkgbuilder/build.py

@@ -386,7 +386,7 @@ def fetch_runner(pkgnames, preprocessed=False):
                 if rc > 0:
                     raise pkgbuilder.exceptions.NetworkError(
                         _('Failed to retieve {0} (from ABS/rsync).').format(
-                            pkg.name), pkg=pkg, retcode=rc)
+                            pkg.name), source='rsync', pkg=pkg, retcode=rc)
 
         if aurpkgs:
             print(_(':: Retrieving packages from aur...'))

pkgbuilder/exceptions.py

@@ -86,10 +86,10 @@ def __init__(self, msg, source, exit=True, *args, **kwargs):
         self.msg = msg
         try:
             self.source = source.args[0].reason
-        except:
+        except Exception:
             try:
                 self.source = source.args[0]
-            except:
+            except Exception:
                 self.source = source
         self._source = source
         self.exit = exit

pkgbuilder/pbds.py

@@ -67,10 +67,7 @@ class PBDS(object):
     else:
         paccommand = os.getenv('PACMAN')
 
-    if os.path.exists('/usr/bin/sudo'):
-        hassudo = True
-    else:
-        hassudo = False
+    hassudo = os.path.exists('/usr/bin/sudo')
 
     uid = os.geteuid()
 

pkgbuilder/wrapper.py

@@ -205,10 +205,10 @@ def wrapper(source='AUTO'):
                 if k in allcountable:
                     # == This is a countable argument.
                     if k in allshortc:
-                        for x in range(v):
+                        for _i in range(v):
                             execargs.append('-' + k)
                     elif k in alllongc:
-                        for x in range(v):
+                        for _i in range(v):
                             execargs.append('--' + k)
                 elif v:
                     # == This argument doesn't have a value.
@@ -223,7 +223,7 @@ def wrapper(source='AUTO'):
             elif i[2:] in alllong + alllongc:
                 s = i[2:]
             else:
-                raise SanityError('argparse broke')
+                raise SanityError('argparse broke', 'argparse')
 
             if s in allcommon:
                 pacargs.append(i)