Fix spaces adjacent to commas and operators, to conform with PEP 8.

5 files changed, 32 insertions, 32 deletions

diff --git a/apt/cache.py b/apt/cache.py
index 35da7970..3c3a25e5 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -153,7 +153,7 @@ class Cache(object):
             if item.StatIdle:
                 transient = True
                 continue
-            errMsg += "Failed to fetch %s %s\n" % (item.DescURI,item.ErrorText)
+            errMsg += "Failed to fetch %s %s\n" % (item.DescURI, item.ErrorText)
             failed = True
 
         # we raise a exception if the download failed or it was cancelt
@@ -371,7 +371,7 @@ if __name__ == "__main__":
     for d in ["/tmp/pytest", "/tmp/pytest/partial"]:
         if not os.path.exists(d):
             os.mkdir(d)
-    apt_pkg.Config.Set("Dir::Cache::Archives","/tmp/pytest")
+    apt_pkg.Config.Set("Dir::Cache::Archives", "/tmp/pytest")
     pm = apt_pkg.GetPackageManager(c._depcache)
     fetcher = apt_pkg.GetAcquire(apt.progress.TextFetchProgress())
     c._fetchArchives(fetcher, pm)
diff --git a/apt/cdrom.py b/apt/cdrom.py
index 7f9b4776..d6f098db 100644
--- a/apt/cdrom.py
+++ b/apt/cdrom.py
@@ -18,7 +18,7 @@ class Cdrom(object):
             self._progress = progress
         # see if we have a alternative mountpoint
         if mountpoint is not None:
-            apt_pkg.Config.Set("Acquire::cdrom::mount",mountpoint)
+            apt_pkg.Config.Set("Acquire::cdrom::mount", mountpoint)
         # do not mess with mount points by default
         if nomount is True:
             apt_pkg.Config.Set("APT::CDROM::NoMount", "true")
diff --git a/apt/debfile.py b/apt/debfile.py
index 365847d7..1a64b833 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -34,9 +34,9 @@ class DebPackage(object):
         """ return the list of files in the deb """
         files = []
 
-        def extract_cb(What,Name,Link,Mode,UID,GID,Size,MTime,Major,Minor):
+        def extract_cb(What, Name, Link, Mode, UID, GID, Size, MTime, Major, Minor):
             #print "%s '%s','%s',%u,%u,%u,%u,%u,%u,%u"\
-            #      % (What,Name,Link,Mode,UID,GID,Size, MTime, Major, Minor)
+            #      % (What, Name, Link, Mode, UID, GID, Size, MTime, Major, Minor)
             files.append(Name)
 
         for member in self._supported_data_members:
diff --git a/apt/package.py b/apt/package.py
index b771c677..eef598af 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -102,7 +102,7 @@ class Package(object):
             print "No FileList for: %s " % self._pkg.Name()
             return False
         f, index = ver.FileList.pop(0)
-        self._records.Lookup((f,index))
+        self._records.Lookup((f, index))
         return True
 
 
@@ -259,11 +259,11 @@ class Package(object):
         self._records.Lookup(desc_iter.FileList.pop(0))
         desc = ""
         try:
-            s = unicode(self._records.LongDesc,"utf-8")
-        except UnicodeDecodeError,e:
+            s = unicode(self._records.LongDesc, "utf-8")
+        except UnicodeDecodeError, e:
             s = _("Invalid unicode in description for '%s' (%s). "
-                  "Please report.") % (self.name,e)
-        for line in string.split(s,"\n"):
+                  "Please report.") % (self.name, e)
+        for line in string.split(s, "\n"):
                 tmp = string.strip(line)
                 if tmp == ".":
                     desc += "\n"
@@ -380,7 +380,7 @@ class Package(object):
 
         def __repr__(self):
             return "component: '%s' archive: '%s' origin: '%s' label: '%s' " \
-                   "site '%s' isTrusted: '%s'"%  (self.component, self.archive,
+                   "site '%s' isTrusted: '%s'" % (self.component, self.archive,
                                                   self.origin, self.label,
                                                   self.site, self.trusted)
 
@@ -389,7 +389,7 @@ class Package(object):
         if not ver:
             return None
         origins = []
-        for (verFileIter,index) in ver.FileList:
+        for (verFileIter, index) in ver.FileList:
             origins.append(self.Origin(self, verFileIter))
         return origins
     candidateOrigin = property(candidateOrigin)
@@ -440,7 +440,7 @@ class Package(object):
             self.markInstall()
         else:
             # FIXME: we may want to throw a exception here
-            sys.stderr.write("MarkUpgrade() called on a non-upgrable pkg: '%s'\n"  %self._pkg.Name)
+            sys.stderr.write("MarkUpgrade() called on a non-upgrable pkg: '%s'\n" % self._pkg.Name)
 
     def commit(self, fprogress, iprogress):
         """ commit the changes, need a FetchProgress and InstallProgress
@@ -477,10 +477,10 @@ if __name__ == "__main__":
     print "PackageSize: %s " % pkg.packageSize
     print "Dependencies: %s" % pkg.installedDependencies
     for dep in pkg.candidateDependencies:
-        print ",".join(["%s (%s) (%s) (%s)" % (o.name,o.version,o.relation, o.preDepend) for o in dep.or_dependencies])
+        print ",".join(["%s (%s) (%s) (%s)" % (o.name, o.version, o.relation, o.preDepend) for o in dep.or_dependencies])
     print "arch: %s" % pkg.architecture
     print "homepage: %s" % pkg.homepage
-    print "rec: ",pkg.candidateRecord
+    print "rec: ", pkg.candidateRecord
 
     # now test install/remove
     import apt
@@ -491,7 +491,7 @@ if __name__ == "__main__":
         for name in cache.keys():
             pkg = cache[name]
             if pkg.isUpgradable:
-                if random.randint(0,1) == 1:
+                if random.randint(0, 1) == 1:
                     pkg.markInstall(i)
         print "Broken: %s " % cache._depcache.BrokenCount
         print "InstCount: %s " % cache._depcache.InstCount
@@ -502,7 +502,7 @@ if __name__ == "__main__":
         print "Randomly remove some packages with AutoFix: %s" % i
         cache = apt.Cache(progress)
         for name in cache.keys():
-            if random.randint(0,1) == 1:
+            if random.randint(0, 1) == 1:
                 try:
                     cache[name].markDelete(i)
                 except SystemError:
diff --git a/apt/progress.py b/apt/progress.py
index 6f72197e..dbad8050 100644
--- a/apt/progress.py
+++ b/apt/progress.py
@@ -53,7 +53,7 @@ class OpTextProgress(OpProgress):
         OpProgress.__init__(self)
 
     def update(self, percent):
-        sys.stdout.write("\r%s: %.2i  " % (self.subOp,percent))
+        sys.stdout.write("\r%s: %.2i  " % (self.subOp, percent))
         sys.stdout.flush()
 
     def done(self):
@@ -71,11 +71,11 @@ class FetchProgress(object):
     dlFailed = 2
     dlHit = 3
     dlIgnored = 4
-    dlStatusStr = {dlDone : "Done",
-                   dlQueued : "Queued",
-                   dlFailed : "Failed",
-                   dlHit : "Hit",
-                   dlIgnored : "Ignored"}
+    dlStatusStr = {dlDone: "Done",
+                   dlQueued: "Queued",
+                   dlFailed: "Failed",
+                   dlHit: "Hit",
+                   dlIgnored: "Ignored"}
 
     def __init__(self):
         self.eta = 0.0
@@ -134,7 +134,7 @@ class TextFetchProgress(FetchProgress):
         """ react to media change events """
         res = True;
         print "Media change: please insert the disc labeled \
-               '%s' in the drive '%s' and press enter" % (medium,drive)
+               '%s' in the drive '%s' and press enter" % (medium, drive)
         s = sys.stdin.readline()
         if(s == 'c' or s == 'C'):
             res = false;
@@ -174,7 +174,7 @@ class InstallProgress(DumbInstallProgress):
         (read, write) = os.pipe()
         self.writefd=write
         self.statusfd = os.fdopen(read, "r")
-        fcntl.fcntl(self.statusfd.fileno(), fcntl.F_SETFL,os.O_NONBLOCK)
+        fcntl.fcntl(self.statusfd.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
         self.read = ""
         self.percent = 0.0
         self.status = ""
@@ -183,7 +183,7 @@ class InstallProgress(DumbInstallProgress):
         " called when a error is detected during the install "
         pass
 
-    def conffile(self,current,new):
+    def conffile(self, current, new):
         " called when a conffile question from dpkg is detected "
         pass
 
@@ -195,8 +195,8 @@ class InstallProgress(DumbInstallProgress):
         if self.statusfd != None:
                 try:
                     while not self.read.endswith("\n"):
-                        self.read += os.read(self.statusfd.fileno(),1)
-                except OSError, (errno,errstr):
+                        self.read += os.read(self.statusfd.fileno(), 1)
+                except OSError, (errno, errstr):
                     # resource temporarly unavailable is ignored
                     if errno != EAGAIN and errnor != EWOULDBLOCK:
                         print errstr
@@ -204,14 +204,14 @@ class InstallProgress(DumbInstallProgress):
                     s = self.read
                     #print s
                     try:
-                        (status, pkg, percent, status_str) = string.split(s, ":",3)
+                        (status, pkg, percent, status_str) = string.split(s, ":", 3)
                     except ValueError, e:
                         # silently ignore lines that can't be parsed
                         self.read = ""
                         return
                     #print "percent: %s %s" % (pkg, float(percent)/100.0)
                     if status == "pmerror":
-                        self.error(pkg,status_str)
+                        self.error(pkg, status_str)
                     elif status == "pmconffile":
                         # we get a string like this:
                         # 'current-conffile' 'new-conffile' useredited distedited
@@ -231,9 +231,9 @@ class InstallProgress(DumbInstallProgress):
 
     def waitChild(self):
         while True:
-            select.select([self.statusfd],[],[], self.selectTimeout)
+            select.select([self.statusfd], [], [], self.selectTimeout)
             self.updateInterface()
-            (pid, res) = os.waitpid(self.child_pid,os.WNOHANG)
+            (pid, res) = os.waitpid(self.child_pid, os.WNOHANG)
             if pid == self.child_pid:
                 break
         return os.WEXITSTATUS(res)