Merge lp:~elachuni/software-center/pep8-test-part18 into lp:software-center

[Anthony Lenton]

The remaining files under softwarecenter.db and all of softwarecenter.distro pass the pep8 test.

[Gary Lasker (gary-lasker)]

Pins pep8 badge to achuni's chest. Salutes.

review: Approve

=== modified file 'softwarecenter/db/appfilter.py'
--- softwarecenter/db/appfilter.py	2011-09-20 12:09:53 +0000
+++ softwarecenter/db/appfilter.py	2012-03-16 18:55:25 +0000
@@ -5,15 +5,18 @@
                                   AVAILABLE_FOR_PURCHASE_MAGIC_CHANNEL_NAME,
                                   )
 
+
 class GlobalFilter(object):
     def __init__(self):
         self.supported_only = False
 
 global_filter = GlobalFilter()
 
+
 def get_global_filter():
     return global_filter
 
+
 class AppFilter(xapian.MatchDecider):
     """
     Filter that can be hooked into xapian get_mset to filter for criteria that
@@ -30,49 +33,62 @@
         self.installed_only = False
         self.not_installed_only = False
         self.restricted_list = False
+
     @property
     def required(self):
-        """ True if the filter is in a state that it should be part of a query """
+        """True if the filter is in a state that it should be part of a
+           query
+        """
         return (self.available_only or
                 global_filter.supported_only or
-                self.installed_only or 
+                self.installed_only or
                 self.not_installed_only or
                 self.restricted_list)
+
     def set_available_only(self, v):
         self.available_only = v
+
     def set_supported_only(self, v):
         global_filter.supported_only = v
+
     def set_installed_only(self, v):
         self.installed_only = v
+
     def set_not_installed_only(self, v):
         self.not_installed_only = v
+
     def set_restricted_list(self, v):
         self.restricted_list = v
+
     def get_supported_only(self):
         return global_filter.supported_only
+
     def __eq__(self, other):
-        if self is None and other is not None: 
+        if self is None and other is not None:
             return True
-        if self is None or other is None: 
+        if self is None or other is None:
             return False
         return (self.installed_only == other.installed_only and
                 self.not_installed_only == other.not_installed_only and
                 global_filter.supported_only == other.supported_only and
                 self.restricted_list == other.restricted_list)
+
     def __ne__(self, other):
         return not self.__eq__(other)
+
     def __call__(self, doc):
         """return True if the package should be displayed"""
         # get pkgname from document
-        pkgname =  self.db.get_pkgname(doc)
+        pkgname = self.db.get_pkgname(doc)
         #logging.debug(
         #    "filter: supported_only: %s installed_only: %s '%s'" % (
         #        self.supported_only, self.installed_only, pkgname))
         if self.available_only:
             # an item is considered available if it is either found
             # in the cache or is available for purchase
-            if (not pkgname in self.cache and 
-                not doc.get_value(XapianValues.ARCHIVE_CHANNEL) == AVAILABLE_FOR_PURCHASE_MAGIC_CHANNEL_NAME):
+            if (not pkgname in self.cache and
+                not doc.get_value(XapianValues.ARCHIVE_CHANNEL) ==
+                    AVAILABLE_FOR_PURCHASE_MAGIC_CHANNEL_NAME):
                 return False
         if self.installed_only:
             if (not pkgname in self.cache or
@@ -85,16 +101,17 @@
         if global_filter.supported_only:
             if not self.distro.is_supported(self.cache, doc, pkgname):
                 return False
-        if self.restricted_list != False: # keep != False as the set can be empty
+        if self.restricted_list != False:  # keep != False as the set can be
+                                           # empty
             if not pkgname in self.restricted_list:
                 return False
         return True
+
     def copy(self):
         """ create a new copy of the given filter """
-        new_filter= AppFilter(self.db, self.cache)
+        new_filter = AppFilter(self.db, self.cache)
         new_filter.available_only = self.available_only
         new_filter.installed_only = self.installed_only
         new_filter.not_installed_only = self.not_installed_only
         new_filter.restricted_list = self.restricted_list
         return new_filter
-        

=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2012-03-15 10:58:19 +0000
+++ softwarecenter/db/application.py	2012-03-16 18:55:25 +0000
@@ -37,6 +37,7 @@
 
 LOG = logging.getLogger(__name__)
 
+
 # this is a very lean class as its used in the main listview
 # and there are a lot of application objects in memory
 class Application(object):
@@ -74,9 +75,11 @@
         if self.appname:
             return self.appname
         return self.pkgname
+
     @property
     def popcon(self):
         return self._popcon
+
     # get a AppDetails object for this Applications
     def get_details(self, db):
         """ return a new AppDetails object for this application """
@@ -90,7 +93,8 @@
             doc = db.get_xapian_document(self.appname, self.pkgname)
         except IndexError:
             return self
-        untranslated_application = doc.get_value(XapianValues.APPNAME_UNTRANSLATED)
+        untranslated_application = doc.get_value(
+            XapianValues.APPNAME_UNTRANSLATED)
         uapp = Application(untranslated_application, self.pkgname)
         return uapp
 
@@ -108,11 +112,12 @@
                 return appname
             else:
                 return db.get_summary(doc)
+
     @staticmethod
     def get_display_summary(db, doc):
         """ Return the application summary as it should be displayed in the UI
-            If the appname is defined, return the application summary, else return
-            the application's pkgname (per the spec)
+            If the appname is defined, return the application summary, else
+            return the application's pkgname (per the spec)
         """
         if doc:
             if db.get_appname(doc):
@@ -123,12 +128,17 @@
     # special methods
     def __hash__(self):
         return ("%s:%s" % (self.appname, self.pkgname)).__hash__()
+
     def __cmp__(self, other):
         return self.apps_cmp(self, other)
+
     def __str__(self):
         return utf8("%s,%s") % (utf8(self.appname), utf8(self.pkgname))
+
     def __repr__(self):
-        return "[Application: appname=%s pkgname=%s]" % (self.appname, self.pkgname)
+        return "[Application: appname=%s pkgname=%s]" % (self.appname,
+            self.pkgname)
+
     @staticmethod
     def apps_cmp(x, y):
         """ sort method for the applications """
@@ -143,16 +153,17 @@
         else:
             return cmp(x.pkgname, y.pkgname)
 
+
 # the details
 class AppDetails(GObject.GObject):
     """ The details for a Application. This contains all the information
         we have available like website etc
     """
 
-    __gsignals__ = {"screenshots-available" : (GObject.SIGNAL_RUN_FIRST,
-                                               GObject.TYPE_NONE,
-                                               (GObject.TYPE_PYOBJECT,),
-                                              ),
+    __gsignals__ = {"screenshots-available": (GObject.SIGNAL_RUN_FIRST,
+                                              GObject.TYPE_NONE,
+                                              (GObject.TYPE_PYOBJECT,),
+                                             ),
                     }
 
     def __init__(self, db, doc=None, application=None):
@@ -214,7 +225,9 @@
                     not channel_matches and
                     not section_matches):
                     self._error = _("Not found")
-                    self._error_not_found = utf8(_(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.")) % utf8(self.pkgname)
+                    self._error_not_found = utf8(_(u"There isn\u2019t a "
+                        "software package called \u201c%s\u201D in your "
+                        "current software sources.")) % utf8(self.pkgname)
 
     def same_app(self, other):
         return self.pkgname == other.pkgname
@@ -241,7 +254,6 @@
         raise ValueError("pkg '%s' has not archive_suite '%s'" % (
                 pkg, archive_suite))
 
-
     @property
     def channelname(self):
         if self._doc:
@@ -251,7 +263,8 @@
                 return channel
         else:
             # check if we have an apturl request to enable a channel
-            channel_matches = re.findall(r'channel=([0-9a-z,-]*)', self._app.request)
+            channel_matches = re.findall(r'channel=([0-9a-z,-]*)',
+                self._app.request)
             if channel_matches:
                 channel = channel_matches[0]
                 channelfile = APP_INSTALL_CHANNELS_PATH + channel + ".list"
@@ -268,7 +281,7 @@
     def eulafile(self):
         channel = self.channelname
         if channel:
-            eulafile =  APP_INSTALL_CHANNELS_PATH + channel + ".eula"
+            eulafile = APP_INSTALL_CHANNELS_PATH + channel + ".eula"
             if os.path.exists(eulafile):
                 return eulafile
 
@@ -292,11 +305,14 @@
             return comp
         # then apturl requests
         else:
-            section_matches = re.findall(r'section=([a-z]+)', self._app.request)
+            section_matches = re.findall(r'section=([a-z]+)',
+                self._app.request)
             if section_matches:
                 valid_section_matches = []
                 for section_match in section_matches:
-                    if self._unavailable_component(component_to_check=section_match) and valid_section_matches.count(section_match) == 0:
+                    if (self._unavailable_component(
+                        component_to_check=section_match) and
+                        valid_section_matches.count(section_match) == 0):
                         valid_section_matches.append(section_match)
                 if valid_section_matches:
                     return ('&').join(valid_section_matches)
@@ -305,6 +321,7 @@
     def desktop_file(self):
         if self._doc:
             return self._doc.get_value(XapianValues.DESKTOP_FILE)
+
     @property
     def description(self):
         if self._pkg:
@@ -328,8 +345,10 @@
             return self._error
         # this may have changed since we inited the appdetails
         elif self.pkg_state == PkgStates.NOT_FOUND:
-            self._error =  _("Not found")
-            self._error_not_found = utf8(_(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.")) % utf8(self.pkgname)
+            self._error = _("Not found")
+            self._error_not_found = utf8(_(u"There isn\u2019t a software "
+                "package called \u201c%s\u201D in your current software "
+                "sources.")) % utf8(self.pkgname)
             return self._error_not_found
 
     @property
@@ -354,7 +373,8 @@
     @property
     def cached_icon_file_path(self):
         if self._doc:
-            return os.path.join(SOFTWARE_CENTER_ICON_CACHE_DIR, self._db.get_iconname(self._doc))
+            return os.path.join(SOFTWARE_CENTER_ICON_CACHE_DIR,
+                self._db.get_iconname(self._doc))
 
     @property
     def installation_date(self):
@@ -416,8 +436,8 @@
     @property
     def display_summary(self):
         """ Return the application summary as it should be displayed in the UI
-            If the appname is defined, return the application summary, else return
-            the application's pkgname (per the spec)
+            If the appname is defined, return the application summary, else
+            return the application's pkgname (per the spec)
         """
         if self._doc:
             return Application.get_display_summary(self._db, self._doc)
@@ -456,7 +476,7 @@
         #   not-automatic channels (like experimental/backports)
         if self._pkg:
             if self._pkg.installed and self._app.archive_suite:
-                archive_suites = [origin.archive 
+                archive_suites = [origin.archive
                                   for origin in self._pkg.installed.origins]
                 if not self._app.archive_suite in archive_suites:
                     return PkgStates.FORCE_VERSION
@@ -477,8 +497,10 @@
                 if self._unavailable_channel():
                     return PkgStates.NEEDS_SOURCE
                 else:
-                    self._error =  _("Not found")
-                    self._error_not_found = utf8(_(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.")) % utf8(self.pkgname)
+                    self._error = _("Not found")
+                    self._error_not_found = utf8(_(u"There isn\u2019t a "
+                        "software package called \u201c%s\u201D in your "
+                        "current software sources.")) % utf8(self.pkgname)
                     return PkgStates.NOT_FOUND
             else:
                 if self.price:
@@ -505,10 +527,13 @@
                 if self.component:
                     components = self.component.split('&')
                     for component in components:
-                        if component and self._unavailable_component(component_to_check=component):
+                        if component and self._unavailable_component(
+                            component_to_check=component):
                             return PkgStates.NEEDS_SOURCE
-                self._error =  _("Not found")
-                self._error_not_found = utf8(_(u"There isn\u2019t a software package called \u201c%s\u201D in your current software sources.")) % utf8(self.pkgname)
+                self._error = _("Not found")
+                self._error_not_found = utf8(_(u"There isn\u2019t a software "
+                    "package called \u201c%s\u201D in your current software "
+                    "sources.")) % utf8(self.pkgname)
                 return PkgStates.NOT_FOUND
         return PkgStates.UNKNOWN
 
@@ -520,7 +545,8 @@
     @property
     def supported_distros(self):
         if self._doc:
-            supported_series = self._doc.get_value(XapianValues.SC_SUPPORTED_DISTROS)
+            supported_series = self._doc.get_value(
+                XapianValues.SC_SUPPORTED_DISTROS)
             if not supported_series:
                 return {}
 
@@ -552,8 +578,10 @@
             if screenshot_url:
                 return screenshot_url.split(",")[0]
         # else use the default
-        return self._distro.SCREENSHOT_LARGE_URL % { 'pkgname' : self.pkgname,
-                                                     'version' : self.version or 0 }
+        return self._distro.SCREENSHOT_LARGE_URL % {
+            'pkgname': self.pkgname,
+            'version': self.version or 0,
+        }
 
     @property
     def screenshots(self):
@@ -561,10 +589,11 @@
             "query_multiple_screenshos" was run before and emited the signal
         """
         if not self._screenshot_list:
-            return [ {'small_image_url': self.thumbnail,
-                      'large_image_url': self.screenshot,
-                      'version': self.version},
-                   ]
+            return [{
+                'small_image_url': self.thumbnail,
+                'large_image_url': self.screenshot,
+                'version': self.version,
+            }]
         return self._screenshot_list
 
     @property
@@ -583,17 +612,18 @@
             screenshot_url = self._doc.get_value(XapianValues.SCREENSHOT_URLS)
             if screenshot_url and len(screenshot_url.split(",")) > 1:
                 for screenshot in screenshot_url.split(","):
-                    screenshot_list.append({'small_image_url' : screenshot,
-                                            'large_image_url' : screenshot,
-                                            'version' : self.version,
-                                            })
+                    screenshot_list.append({
+                        'small_image_url': screenshot,
+                        'large_image_url': screenshot,
+                        'version': self.version,
+                    })
         return screenshot_list
 
     def query_multiple_screenshots(self):
         """ query if multiple screenshots for the given app are available
             and if so, emit "screenshots-available" signal
         """
-        # get screenshot list from the db, if that is empty thats fine, 
+        # get screenshot list from the db, if that is empty thats fine,
         # and we will query the screenshot server
         if not self._screenshot_list:
             self._screenshot_list = self._get_multiple_screenshots_from_db()
@@ -612,7 +642,7 @@
             LOG.exception("failed to load content")
 
     def _sort_screenshots_by_best_version(self, screenshot_list):
-        """ take a screenshot result dict from screenshots.debian.org 
+        """ take a screenshot result dict from screenshots.debian.org
             and sort it
         """
         from softwarecenter.utils import version_compare
@@ -624,9 +654,9 @@
                 screenshot_list.remove(item)
         # now sort from high to low
         return sorted(
-            screenshot_list, 
-            cmp=lambda a,b: version_compare(a["version"] or '', 
-                                            b["version"] or ''),
+            screenshot_list,
+            cmp=lambda a, b: version_compare(a["version"] or '',
+                                             b["version"] or ''),
             reverse=True)
 
     def _gio_screenshots_json_download_complete_cb(self, source, result, path):
@@ -649,7 +679,6 @@
         self._screenshot_list = self._sort_screenshots_by_best_version(
             screenshot_list)
         self.emit("screenshots-available", self._screenshot_list)
-        return
 
     @property
     def summary(self):
@@ -671,8 +700,10 @@
             if self._doc.get_value(XapianValues.THUMBNAIL_URL):
                 return self._doc.get_value(XapianValues.THUMBNAIL_URL)
         # else use the default
-        return self._distro.SCREENSHOT_THUMB_URL % { 'pkgname' : self.pkgname,
-                                                     'version' : self.version or 0}
+        return self._distro.SCREENSHOT_THUMB_URL % {
+            'pkgname': self.pkgname,
+            'version': self.version or 0,
+        }
 
     @property
     def video_url(self):
@@ -681,9 +712,10 @@
             if self._doc.get_value(XapianValues.VIDEO_URL):
                 return self._doc.get_value(XapianValues.VIDEO_URL)
         # else use the video server
-        #return self._distro.VIDEO_URL % { 'pkgname' : self.pkgname,
-        #                                  'version' : self.version or 0}
-        return None
+        #return self._distro.VIDEO_URL % {
+        #    'pkgname' : self.pkgname,
+        #    'version' : self.version or 0,
+        #}
 
     @property
     def version(self):
@@ -745,7 +777,8 @@
         # apturl minver matches
         if not self.pkg_state == PkgStates.INSTALLED:
             if self._app.request:
-                minver_matches = re.findall(r'minver=[a-z,0-9,-,+,.,~]*', self._app.request)
+                minver_matches = re.findall(r'minver=[a-z,0-9,-,+,.,~]*',
+                    self._app.request)
                 if minver_matches and self.version:
                     minver = minver_matches[0][7:]
                     from softwarecenter.utils import version_compare
@@ -763,10 +796,11 @@
                 sources = source_to_enable.split('&')
                 sources_length = len(sources)
                 if sources_length == 1:
-                    warning = _("Available from the \"%s\" source.") % sources[0]
+                    warning = (_("Available from the \"%s\" source.") %
+                        sources[0])
                 elif sources_length > 1:
-                    # Translators: the visible string is constructed concatenating
-                    # the following 3 strings like this:
+                    # Translators: the visible string is constructed
+                    # concatenating the following 3 strings like this:
                     # Available from the following sources: %s, ... %s, %s.
                     warning = _("Available from the following sources: ")
                     # Cycle through all, but the last
@@ -805,7 +839,7 @@
             if tag.startswith(REGIONTAG):
                 # we found a region tag, now the region must match
                 res = False
-            if tag == REGIONTAG+my_region:
+            if tag == REGIONTAG + my_region:
                 # we have the right region
                 return True
         return res
@@ -822,7 +856,7 @@
         result = {}
         try:
             from softwarecenter.hw import get_hardware_support_for_tags
-            result =  get_hardware_support_for_tags(self.tags)
+            result = get_hardware_support_for_tags(self.tags)
         except ImportError:
             LOG.warn("failed to import debtagshw")
             return result
@@ -835,7 +869,7 @@
         return not is_channel_available(self.channelname)
 
     def _unavailable_component(self, component_to_check=None):
-        """ Check if the given doc refers to a component that is currently 
+        """ Check if the given doc refers to a component that is currently
             not enabled
         """
         if component_to_check:
@@ -843,7 +877,7 @@
         elif self.component:
             component = self.component
         else:
-            component =  self._doc.get_value(XapianValues.ARCHIVE_SECTION)
+            component = self._doc.get_value(XapianValues.ARCHIVE_SECTION)
         if not component:
             return False
         distro_codename = self._distro.get_codename()
@@ -870,7 +904,8 @@
         details.append("   installation_date: %s" % self.installation_date)
         details.append("       purchase_date: %s" % self.purchase_date)
         details.append("             license: %s" % self.license)
-        details.append("         license_key: %s" % self.license_key[0:3] + len(self.license_key)*"*")
+        details.append("         license_key: %s" % self.license_key[0:3] +
+            len(self.license_key) * "*")
         details.append("    license_key_path: %s" % self.license_key_path)
         details.append("      date_published: %s" % self.date_published)
         details.append("  maintenance_status: %s" % self.maintenance_status)

=== modified file 'softwarecenter/distro/Debian.py'
--- softwarecenter/distro/Debian.py	2011-12-16 10:10:10 +0000
+++ softwarecenter/distro/Debian.py	2012-03-16 18:55:25 +0000
@@ -22,14 +22,17 @@
 from softwarecenter.distro import Distro
 from gettext import gettext as _
 
+
 class Debian(Distro):
 
     # metapackages
     IMPORTANT_METAPACKAGES = ("kde", "gnome", "gnome-desktop-environment")
 
     # screenshot handling
-    SCREENSHOT_THUMB_URL =  "http://screenshots.debian.net/thumbnail/%(pkgname)s"
-    SCREENSHOT_LARGE_URL = "http://screenshots.debian.net/screenshot/%(pkgname)s"
+    SCREENSHOT_THUMB_URL = ("http://screenshots.debian.net/"
+        "thumbnail/%(pkgname)s")
+    SCREENSHOT_LARGE_URL = ("http://screenshots.debian.net/"
+        "screenshot/%(pkgname)s")
     # the json description of the available screenshots
     SCREENSHOT_JSON_URL = "http://screenshots.debian.net/json/package/%s"
 
@@ -54,8 +57,9 @@
         for m in depends:
             if cache[m].section == "metapackages":
                 primary = _("If you uninstall %s, future updates will not "
-                              "include new items in <b>%s</b> set. "
-                              "Are you sure you want to continue?") % (appname, cache[m].installed.summary)
+                            "include new items in <b>%s</b> set. "
+                            "Are you sure you want to continue?") % (appname,
+                            cache[m].installed.summary)
                 button_text = _("Remove Anyway")
                 depends = []
                 break
@@ -71,7 +75,7 @@
                 depends = None
                 break
         return (primary, button_text)
-        
+
     def get_license_text(self, component):
         if component in ("main",):
             return _("Meets the Debian Free Software Guidelines")
@@ -106,7 +110,8 @@
                     return True
         return False
 
-    def get_maintenance_status(self, cache, appname, pkgname, component, channelname):
+    def get_maintenance_status(self, cache, appname, pkgname, component,
+        channelname):
         """Return the maintenance status of a package."""
         if not hasattr(cache, '_cache') or not pkgname:
             return
@@ -143,16 +148,17 @@
             elif pkg_archive == "unstable":
                 return _("Debian does not provide critical updates "
                          "for %s") % appname
-        return
 
     def get_supported_query(self):
         import xapian
-        query1 = xapian.Query("XOL"+"Debian")
-        query2 = xapian.Query("XOC"+"main")
+        query1 = xapian.Query("XOL" + "Debian")
+        query2 = xapian.Query("XOC" + "main")
         return xapian.Query(xapian.Query.OP_AND, query1, query2)
 
 
 if __name__ == "__main__":
     cache = apt.Cache()
-    print(cache.get_maintenance_status(cache, "synaptic app", "synaptic", "main", None))
-    print(cache.get_maintenance_status(cache, "3dchess app", "3dchess", "universe", None))
+    print(cache.get_maintenance_status(cache, "synaptic app", "synaptic",
+        "main", None))
+    print(cache.get_maintenance_status(cache, "3dchess app", "3dchess",
+        "universe", None))

=== modified file 'softwarecenter/distro/Fedora.py'
--- softwarecenter/distro/Fedora.py	2011-12-16 12:50:18 +0000
+++ softwarecenter/distro/Fedora.py	2012-03-16 18:55:25 +0000
@@ -22,13 +22,14 @@
 from softwarecenter.distro import Distro
 from gettext import gettext as _
 
+
 class Fedora(Distro):
     DISTROSERIES = [
-        'Beefy Miracle', 
-        'Verne', 
-        'Lovelock', 
-        'Laughlin', 
-        'Leonidas', 
+        'Beefy Miracle',
+        'Verne',
+        'Lovelock',
+        'Laughlin',
+        'Leonidas',
         'Constantine',
     ]
 
@@ -37,25 +38,29 @@
 
     # screenshot handling
     # FIXME - fedora should get its own proxy eventually
-    SCREENSHOT_THUMB_URL =  "http://screenshots.ubuntu.com/thumbnail-with-version/%(pkgname)s/%(version)s"
-    SCREENSHOT_LARGE_URL = "http://screenshots.ubuntu.com/screenshot-with-version/%(pkgname)s/%(version)s"
+    SCREENSHOT_THUMB_URL = ("http://screenshots.ubuntu.com/"
+        "thumbnail-with-version/%(pkgname)s/%(version)s")
+    SCREENSHOT_LARGE_URL = ("http://screenshots.ubuntu.com/"
+        "screenshot-with-version/%(pkgname)s/%(version)s")
     SCREENSHOT_JSON_URL = "http://screenshots.ubuntu.com/json/package/%s"
-    
+
     # reviews
     # FIXME: fedora will want to get their own review server instance at
     #        some point I imagine :) (or a alternative backend)
     #
-    REVIEWS_SERVER = os.environ.get("SOFTWARE_CENTER_REVIEWS_HOST") or "http://reviews.ubuntu.com/reviews/api/1.0"
-    REVIEWS_URL = REVIEWS_SERVER + "/reviews/filter/%(language)s/%(origin)s/%(distroseries)s/%(version)s/%(pkgname)s%(appname)s/"
+    REVIEWS_SERVER = (os.environ.get("SOFTWARE_CENTER_REVIEWS_HOST") or
+        "http://reviews.ubuntu.com/reviews/api/1.0")
+    REVIEWS_URL = (REVIEWS_SERVER + "/reviews/filter/%(language)s/%(origin)s/"
+        "%(distroseries)s/%(version)s/%(pkgname)s%(appname)s/")
 
-    REVIEW_STATS_URL = REVIEWS_SERVER+"/review-stats"
+    REVIEW_STATS_URL = REVIEWS_SERVER + "/review-stats"
 
     def get_distro_channel_name(self):
         """ The name of the primary repository """
         return "fedora"
 
     def get_distro_channel_description(self):
-        """ The description of the main distro channel 
+        """ The description of the main distro channel
             Overrides what's present in yum.conf for fedora, updates,
             updates-testing, their respective -source and -debuginfo
         """
@@ -70,7 +75,7 @@
         button_text = _("Remove All")
 
         return (primary, button_text)
-        
+
     def get_license_text(self, component):
         # with a PackageKit backend, component is always 'main'
         # (but we have license in the individual packages)
@@ -86,13 +91,13 @@
         origin = cache.get_origin(pkgname)
         return origin == 'fedora' or origin == 'updates'
 
-    def get_maintenance_status(self, cache, appname, pkgname, component, channelname):
+    def get_maintenance_status(self, cache, appname, pkgname, component,
+        channelname):
         # FIXME
-        return
+        pass
 
     def get_supported_query(self):
         import xapian
-        query1 = xapian.Query("XOO"+"fedora")
-        query2 = xapian.Query("XOO"+"updates")
+        query1 = xapian.Query("XOO" + "fedora")
+        query2 = xapian.Query("XOO" + "updates")
         return xapian.Query(xapian.Query.OP_OR, query1, query2)
-

=== modified file 'softwarecenter/distro/SUSELINUX.py'
--- softwarecenter/distro/SUSELINUX.py	2011-11-02 14:13:26 +0000
+++ softwarecenter/distro/SUSELINUX.py	2012-03-16 18:55:25 +0000
@@ -20,28 +20,33 @@
 from gettext import gettext as _
 from softwarecenter.distro import Distro
 
+
 class SUSELINUX(Distro):
     # see __init__.py description
     DISTROSERIES = ["11.4",
                    ]
 
     # screenshot handling
-    SCREENSHOT_THUMB_URL =  "http://screenshots.ubuntu.com/thumbnail-with-version/%(pkgname)s/%(version)s"
-    SCREENSHOT_LARGE_URL = "http://screenshots.ubuntu.com/screenshot-with-version/%(pkgname)s/%(version)s"
+    SCREENSHOT_THUMB_URL = ("http://screenshots.ubuntu.com/"
+        "thumbnail-with-version/%(pkgname)s/%(version)s")
+    SCREENSHOT_LARGE_URL = ("http://screenshots.ubuntu.com/"
+        "screenshot-with-version/%(pkgname)s/%(version)s")
     SCREENSHOT_JSON_URL = "http://screenshots.ubuntu.com/json/package/%s"
-    
+
     # reviews
-    REVIEWS_SERVER = os.environ.get("SOFTWARE_CENTER_REVIEWS_HOST") or "http://reviews.ubuntu.com/reviews/api/1.0"
-    REVIEWS_URL = REVIEWS_SERVER + "/reviews/filter/%(language)s/%(origin)s/%(distroseries)s/%(version)s/%(pkgname)s%(appname)s/"
+    REVIEWS_SERVER = (os.environ.get("SOFTWARE_CENTER_REVIEWS_HOST") or
+        "http://reviews.ubuntu.com/reviews/api/1.0")
+    REVIEWS_URL = (REVIEWS_SERVER + "/reviews/filter/%(language)s/%(origin)s/"
+        "%(distroseries)s/%(version)s/%(pkgname)s%(appname)s/")
 
-    REVIEW_STATS_URL = REVIEWS_SERVER+"/review-stats"
+    REVIEW_STATS_URL = REVIEWS_SERVER + "/review-stats"
 
     def get_app_name(self):
         return _("Software Center")
 
     def get_app_description(self):
         return _("Lets you choose from thousands of applications available.")
-    
+
     def get_distro_channel_name(self):
         """ The name in the Release file """
         return "openSUSE"
@@ -70,17 +75,17 @@
     def get_supported_query(self):
         # FIXME
         import xapian
-        query1 = xapian.Query("XOL"+"Ubuntu")
-        query2a = xapian.Query("XOC"+"main")
-        query2b = xapian.Query("XOC"+"restricted")
+        query1 = xapian.Query("XOL" + "Ubuntu")
+        query2a = xapian.Query("XOC" + "main")
+        query2b = xapian.Query("XOC" + "restricted")
         query2 = xapian.Query(xapian.Query.OP_OR, query2a, query2b)
         return xapian.Query(xapian.Query.OP_AND, query1, query2)
 
-    def get_maintenance_status(self, cache, appname, pkgname, component, channelname):
+    def get_maintenance_status(self, cache, appname, pkgname, component,
+        channelname):
         # FIXME
-        return
+        pass
 
     def get_downloadable_icon_url(self, full_archive_url, icon_filename):
         # FIXME
-        return None
-
+        pass

=== modified file 'softwarecenter/distro/Ubuntu.py'
--- softwarecenter/distro/Ubuntu.py	2012-03-06 15:00:23 +0000
+++ softwarecenter/distro/Ubuntu.py	2012-03-16 18:55:25 +0000
@@ -31,6 +31,7 @@
 
 LOG = logging.getLogger(__name__)
 
+
 class Ubuntu(Debian):
 
     # see __init__.py description
@@ -43,22 +44,28 @@
     IMPORTANT_METAPACKAGES = ("ubuntu-desktop", "kubuntu-desktop")
 
     # screenshot handling
-    SCREENSHOT_THUMB_URL =  "http://screenshots.ubuntu.com/thumbnail-with-version/%(pkgname)s/%(version)s"
-    SCREENSHOT_LARGE_URL = "http://screenshots.ubuntu.com/screenshot-with-version/%(pkgname)s/%(version)s"
+    SCREENSHOT_THUMB_URL = ("http://screenshots.ubuntu.com/"
+        "thumbnail-with-version/%(pkgname)s/%(version)s")
+    SCREENSHOT_LARGE_URL = ("http://screenshots.ubuntu.com/"
+        "screenshot-with-version/%(pkgname)s/%(version)s")
 
     # the json description of the available screenshots
     SCREENSHOT_JSON_URL = "http://screenshots.ubuntu.com/json/package/%s"
 
     # purchase subscription
-    PURCHASE_APP_URL = BUY_SOMETHING_HOST+"/subscriptions/%s/ubuntu/%s/+new/?%s"
+    PURCHASE_APP_URL = (BUY_SOMETHING_HOST + "/subscriptions/%s/ubuntu/%s/"
+        "+new/?%s")
 
     # reviews
-    REVIEWS_SERVER = os.environ.get("SOFTWARE_CENTER_REVIEWS_HOST") or "http://reviews.ubuntu.com/reviews/api/1.0"
-    REVIEWS_URL = REVIEWS_SERVER + "/reviews/filter/%(language)s/%(origin)s/%(distroseries)s/%(version)s/%(pkgname)s%(appname)s/"
+    REVIEWS_SERVER = (os.environ.get("SOFTWARE_CENTER_REVIEWS_HOST") or
+        "http://reviews.ubuntu.com/reviews/api/1.0")
+    REVIEWS_URL = (REVIEWS_SERVER + "/reviews/filter/%(language)s/%(origin)s/"
+        "%(distroseries)s/%(version)s/%(pkgname)s%(appname)s/")
 
-    #REVIEW_STATS_URL = REVIEWS_SERVER+"/reviews/api/1.0/%(language)s/%(origin)s/%(distroseries)s/review-stats/"
+    #REVIEW_STATS_URL = (REVIEWS_SERVER + "/reviews/api/1.0/%(language)s/"
+    #    "%(origin)s/%(distroseries)s/review-stats/")
     # FIXME: does that make sense?!?
-    REVIEW_STATS_URL = REVIEWS_SERVER+"/review-stats"
+    REVIEW_STATS_URL = REVIEWS_SERVER + "/review-stats"
 
     # Starting point for Ubuntu app developers
     DEVELOPER_URL = "http://developer.ubuntu.com/"
@@ -67,8 +74,9 @@
         return _("Ubuntu Software Center")
 
     def get_app_description(self):
-        return _("Lets you choose from thousands of applications available for Ubuntu.")
-    
+        return _("Lets you choose from thousands of applications available "
+            "for Ubuntu.")
+
     def get_distro_channel_name(self):
         """ The name in the Release file """
         return "Ubuntu"
@@ -87,7 +95,8 @@
             if cache[m].section == "metapackages":
                 primary = _("If you uninstall %s, future updates will not "
                               "include new items in <b>%s</b> set. "
-                              "Are you sure you want to continue?") % (appname, cache[m].installed.summary)
+                              "Are you sure you want to continue?") % (appname,
+                              cache[m].installed.summary)
                 button_text = _("Remove Anyway")
                 depends = []
                 break
@@ -110,9 +119,10 @@
         elif component == "restricted":
             return _("Proprietary")
         else:
-            # commercial apps provide license info via the software-center-agent,
-            # but if a given commercial app does not provide this for some reason,
-            # default to a license type of "Unknown"
+            # commercial apps provide license info via the
+            # software-center-agent, but if a given commercial app does not
+            # provide this for some reason, default to a license type of
+            # "Unknown"
             return _("Unknown")
 
     def is_supported(self, cache, doc, pkgname):
@@ -120,8 +130,8 @@
         # section. Looking up in the cache seems just as fast/slow.
         if pkgname in cache and cache[pkgname].candidate:
             for origin in cache[pkgname].candidate.origins:
-                if (origin.origin == "Ubuntu" and 
-                    origin.trusted and 
+                if (origin.origin == "Ubuntu" and
+                    origin.trusted and
                     (origin.component == "main" or
                      origin.component == "restricted")):
                     return True
@@ -129,25 +139,26 @@
 
     def get_supported_query(self):
         import xapian
-        query1 = xapian.Query("XOL"+"Ubuntu")
-        query2a = xapian.Query("XOC"+"main")
-        query2b = xapian.Query("XOC"+"restricted")
+        query1 = xapian.Query("XOL" + "Ubuntu")
+        query2a = xapian.Query("XOC" + "main")
+        query2b = xapian.Query("XOC" + "restricted")
         query2 = xapian.Query(xapian.Query.OP_OR, query2a, query2b)
         return xapian.Query(xapian.Query.OP_AND, query1, query2)
 
     def get_supported_filter_name(self):
         return _("Canonical-Maintained Software")
 
-    def get_maintenance_status(self, cache, appname, pkgname, component, channelname):
+    def get_maintenance_status(self, cache, appname, pkgname, component,
+        channelname):
         # try to figure out the support dates of the release and make
         # sure to look only for stuff in "Ubuntu" and "distro_codename"
-        # (to exclude stuff in ubuntu-updates for the support time 
+        # (to exclude stuff in ubuntu-updates for the support time
         # calculation because the "Release" file time for that gets
         # updated regularly)
         if not hasattr(cache, '_cache') or not pkgname:
             return
-        releasef = get_release_filename_for_pkg(cache._cache, pkgname, 
-                                                "Ubuntu", 
+        releasef = get_release_filename_for_pkg(cache._cache, pkgname,
+                                                "Ubuntu",
                                                 self.get_codename())
         time_t = get_release_date_from_release_file(releasef)
         # check the release date and show support information
@@ -165,23 +176,27 @@
             # see if we have a "Supported" entry in the pkg record
             if (pkgname in cache and
                 cache[pkgname].candidate):
-                support_time = cache._cache[pkgname].candidate.record.get("Supported")
+                support_time = cache._cache[pkgname].candidate.record.get(
+                    "Supported")
                 if support_time:
                     if support_time.endswith("y"):
-                        support_month = 12*int(support_time.strip("y"))
+                        support_month = 12 * int(support_time.strip("y"))
                     elif support_time.endswith("m"):
                         support_month = int(support_time.strip("m"))
                     else:
-                        LOG.warning("unsupported 'Supported' string '%s'" % support_time)
+                        LOG.warning("unsupported 'Supported' string '%s'" %
+                            support_time)
 
             # mvo: we do not define the end date very precisely
             #      currently this is why it will just display a end
             #      range
             # print release_date, support_month
-            (support_end_year, support_end_month) = get_maintenance_end_date(release_date, support_month)
-            support_end_month_str = locale.nl_langinfo(getattr(locale,"MON_%d" % support_end_month))
+            (support_end_year, support_end_month) = get_maintenance_end_date(
+                release_date, support_month)
+            support_end_month_str = locale.nl_langinfo(
+                getattr(locale, "MON_%d" % support_end_month))
              # check if the support has ended
-            support_ended = (now.year >= support_end_year and 
+            support_ended = (now.year >= support_end_year and
                              now.month > support_end_month)
             if component == "main":
                 if support_ended:
@@ -192,9 +207,10 @@
                 else:
                     return _("Canonical provides critical updates for "
                              "%(appname)s until %(support_end_month_str)s "
-                             "%(support_end_year)s.") % {'appname' : appname,
-                                                         'support_end_month_str' : support_end_month_str,
-                                                         'support_end_year' : support_end_year}
+                             "%(support_end_year)s.") % {
+                                'appname': appname,
+                                'support_end_month_str': support_end_month_str,
+                                'support_end_year': support_end_year}
             elif component == "restricted":
                 if support_ended:
                     return _("Canonical does no longer provide "
@@ -205,10 +221,12 @@
                     return _("Canonical provides critical updates supplied "
                              "by the developers of %(appname)s until "
                              "%(support_end_month_str)s "
-                             "%(support_end_year)s.") % {'appname' : appname,
-                                                         'support_end_month_str' : support_end_month_str,
-                                                         'support_end_year' : support_end_year}
-               
+                             "%(support_end_year)s.") % {
+                                'appname': appname,
+                                'support_end_month_str': support_end_month_str,
+                                'support_end_year': support_end_year,
+                            }
+
         # if we couldn't determine a support date, use a generic maintenance
         # string without the date
         if (channelname or
@@ -223,8 +241,8 @@
             return _("Canonical does not provide updates for %s. "
                      "Some updates may be provided by the "
                      "Ubuntu community.") % appname
-        #return _("Application %s has an unknown maintenance status.") % appname
-        return
+        #return (_("Application %s has an unknown maintenance status.") %
+        #    appname)
 
     def get_downloadable_icon_url(self, full_archive_url, icon_filename):
         """
@@ -250,12 +268,16 @@
             downloadable_icon_url.append(icon_filename)
             return "".join(downloadable_icon_url)
         else:
-            #raise ValueError, "we currently support downloadable icons in ppa's only"
-            LOG.warning("downloadable icon is not supported for archive: '%s'" % full_archive_url)
+            #raise ValueError("we currently support downloadable icons in "
+            #    "ppa's only")
+            LOG.warning("downloadable icon is not supported for archive: '%s'"
+                % full_archive_url)
             return ''
 
 if __name__ == "__main__":
     import apt
     cache = apt.Cache()
-    print cache.get_maintenance_status(cache, "synaptic app", "synaptic", "main", None)
-    print cache.get_maintenance_status(cache, "3dchess app", "3dchess", "universe", None)
+    print cache.get_maintenance_status(cache, "synaptic app", "synaptic",
+        "main", None)
+    print cache.get_maintenance_status(cache, "3dchess app", "3dchess",
+        "universe", None)

=== modified file 'softwarecenter/distro/__init__.py'
--- softwarecenter/distro/__init__.py	2012-01-27 09:46:41 +0000
+++ softwarecenter/distro/__init__.py	2012-03-16 18:55:25 +0000
@@ -36,9 +36,12 @@
     # are found
     DISTROSERIES = []
 
-    # base path for the review summary, the JS will append %i.png (with i={1,5})
-    REVIEW_SUMMARY_STARS_BASE_PATH = "/usr/share/software-center/images/review-summary"
-    REVIEWS_SERVER = os.environ.get("SOFTWARE_CENTER_REVIEWS_HOST") or "http://localhost:8000"
+    # base path for the review summary, the JS will append %i.png
+    # (with i={1,5})
+    REVIEW_SUMMARY_STARS_BASE_PATH = ("/usr/share/software-center/images/"
+        "review-summary")
+    REVIEWS_SERVER = (os.environ.get("SOFTWARE_CENTER_REVIEWS_HOST") or
+        "http://localhost:8000")
 
     # You need to set this var to enable purchases
     PURCHASE_APP_URL = ""
@@ -50,23 +53,23 @@
         """Return a new generic Distro instance."""
 
     def get_app_name(self):
-        """ 
-        The name of the application (as displayed in the main window and 
+        """
+        The name of the application (as displayed in the main window and
         the about window)
         """
         return _("Software Center")
 
     def get_app_description(self):
-        """ 
+        """
         The description of the application displayed in the about dialog
         """
-        return _("Lets you choose from thousands of applications available for your system.")
-
+        return _("Lets you choose from thousands of applications available "
+            "for your system.")
 
     def get_distro_channel_name(self):
         """ The name of the main channel in the Release file (e.g. Ubuntu)"""
         return "none"
- 
+
     def get_distro_channel_description(self):
         """ The description for the main distro channel """
         return "none"
@@ -83,15 +86,16 @@
             self._distro_code_name = platform.dist()[2]
         return self._distro_code_name
 
-    def get_maintenance_status(self, cache, appname, pkgname, component, channelname):
+    def get_maintenance_status(self, cache, appname, pkgname, component,
+        channelname):
         raise UnimplementedError
 
     def get_license_text(self, component):
         raise UnimplementedError
 
     def is_supported(self, cache, doc, pkgname):
-        """ 
-        return True if the given document and pkgname is supported by 
+        """
+        return True if the given document and pkgname is supported by
         the distribution
         """
         raise UnimplementedError
@@ -105,7 +109,8 @@
         return _("Supported Software")
 
     def get_install_warning_text(self, cache, pkg, appname, depends):
-        primary = utf8(_("To install %s, these items must be removed:")) % utf8(appname)
+        primary = (utf8(_("To install %s, these items must be removed:")) %
+            utf8(appname))
         button_text = _("Install Anyway")
 
         # alter it if a meta-package is affected
@@ -113,7 +118,8 @@
             if cache[m].section == "metapackages":
                 primary = utf8(_("If you install %s, future updates will not "
                                  "include new items in <b>%s</b> set. "
-                                 "Are you sure you want to continue?")) % (utf8(appname), cache[m].installed.summary)
+                                 "Are you sure you want to continue?")) % (
+                                 utf8(appname), cache[m].installed.summary)
                 button_text = _("Install Anyway")
                 depends = []
                 break
@@ -121,9 +127,9 @@
         # alter it if an important meta-package is affected
         for m in self.IMPORTANT_METAPACKAGES:
             if m in depends:
-                primary = utf8(_("Installing %s may cause core applications to "
-                                 "be removed. "
-                                 "Are you sure you want to continue?")) % utf8(appname)
+                primary = utf8(_("Installing %s may cause core applications "
+                                 "to be removed. Are you sure you want to "
+                                 "continue?")) % utf8(appname)
                 button_text = _("Install Anyway")
                 depends = None
                 break
@@ -133,16 +139,17 @@
     def get_deauthorize_text(self, account_name, purchased_packages):
         if len(purchased_packages) == 0:
             if account_name:
-                primary = _('Are you sure you want to deauthorize this computer '
-                            'from the "%s" account?') % account_name
+                primary = _('Are you sure you want to deauthorize this '
+                            'computer from the "%s" account?') % account_name
             else:
-                primary = _('Are you sure you want to deauthorize this computer '
-                            'for purchases?')
+                primary = _('Are you sure you want to deauthorize this '
+                            'computer for purchases?')
             button_text = _('Deauthorize')
         else:
             if account_name:
-                primary = _('Deauthorizing this computer from the "%s" account '
-                            'will remove this purchased software:') % account_name
+                primary = _('Deauthorizing this computer from the "%s" '
+                            'account will remove this purchased '
+                            'software:') % account_name
             else:
                 primary = _('Deauthorizing this computer for purchases '
                             'will remove the following purchased software:')
@@ -151,7 +158,7 @@
 
     # generic architecture detection code
     def get_architecture(self):
-        return None
+        pass
 
 
 def _get_distro():
@@ -159,16 +166,18 @@
     distro_id = distro_info[0]
     LOG.debug("get_distro: '%s'", distro_id)
     # start with a import, this gives us only a softwarecenter module
-    module =  __import__(distro_id, globals(), locals(), [], -1)
+    module = __import__(distro_id, globals(), locals(), [], -1)
     # get the right class and instanciate it
     distro_class = getattr(module, distro_id)
     instance = distro_class()
     return instance
 
+
 def get_distro():
     """ factory to return the right Distro object """
     return distro_instance
 
+
 def get_current_arch():
     # for tests and similar
     if "SOFTWARE_CENTER_ARCHITECTURE" in os.environ:
@@ -177,11 +186,12 @@
         return arch
     return get_distro().get_architecture()
 
+
 def get_foreign_architectures():
     return get_distro().get_foreign_architectures()
 
 # singelton
-distro_instance=_get_distro()
+distro_instance = _get_distro()
 
 
 if __name__ == "__main__":

=== modified file 'test/test_pep8.py'
--- test/test_pep8.py	2012-03-15 10:43:13 +0000
+++ test/test_pep8.py	2012-03-16 18:55:25 +0000
@@ -9,13 +9,15 @@
 # Only test these two packages for now:
 import softwarecenter.db
 import softwarecenter.ui
+import softwarecenter.distro
 
 class PackagePep8TestCase(unittest.TestCase):
     maxDiff = None
     packages = [softwarecenter.ui,
                 softwarecenter.db,
+                softwarecenter.distro,
                ]
-    exclude = ['application.py', 'appfilter.py']
+    exclude = []
 
     def message(self, text):
         self.errors.append(text)