launchpad-reviewers team mailing list archive

[Stuart Bishop <stuart.bishop@xxxxxxxxxxxxx>]

Stuart Bishop has proposed merging lp:~stub/launchpad/trivial into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #627741 oops-prune is aborting with a regex mismatch(?)
  https://bugs.launchpad.net/bugs/627741


Under Python 2.6, urllib2.urlopen raises a URLError if a local file is not found. Python 2.5 raises an OSError in this case. This branch catches  and handles the OSError so our tests pass under Python 2.5.
-- 
https://code.launchpad.net/~stub/launchpad/trivial/+merge/37474
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stub/launchpad/trivial into lp:launchpad/devel.

=== modified file 'lib/canonical/launchpad/browser/launchpad.py'
=== modified file 'lib/canonical/launchpad/configure.zcml'
--- lib/canonical/launchpad/configure.zcml	2010-09-29 14:59:57 +0000
+++ lib/canonical/launchpad/configure.zcml	2010-10-04 14:19:56 +0000
@@ -72,9 +72,15 @@
   <browser:url
     for="canonical.launchpad.interfaces.logintoken.ILoginTokenSet"
     path_expression="string:token"
+<<<<<<< TREE
     parent_utility="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
     />
 
+=======
+    parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"
+    />
+
+>>>>>>> MERGE-SOURCE
   <i18n:registerTranslations directory="locales" />
 
   <browser:navigation

=== modified file 'lib/canonical/launchpad/database/__init__.py'
=== modified file 'lib/canonical/testing/layers.py'
=== modified file 'lib/lp/bugs/browser/bugtarget.py'
=== modified file 'lib/lp/bugs/browser/configure.zcml'
=== modified file 'lib/lp/bugs/model/bug.py'
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2010-09-30 01:05:01 +0000
+++ lib/lp/registry/browser/configure.zcml	2010-10-04 14:19:56 +0000
@@ -8,6 +8,7 @@
     xmlns:i18n="http://namespaces.zope.org/i18n";
     xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc";
     i18n_domain="launchpad">
+<<<<<<< TREE
     <!-- RDF downloadable documents -->
     <browser:page
         for="canonical.launchpad.webapp.interfaces.ILaunchpadRoot"
@@ -25,6 +26,25 @@
         permission="zope.Public"
         />
 
+=======
+    <!-- RDF downloadable documents -->
+    <browser:page
+        for="canonical.launchpad.interfaces.ILaunchpadRoot"
+        class="lp.registry.browser.RDFIndexView"
+        name="rdf"
+        template="../templates/rdf-index.pt"
+        permission="zope.Public"
+        />
+
+    <browser:page
+        for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
+        name="rdf-spec"
+        class="lp.registry.browser.RDFFolder"
+        attribute="__call__"
+        permission="zope.Public"
+        />
+
+>>>>>>> MERGE-SOURCE
     <browser:page
         for="lp.registry.interfaces.product.IProduct"
         name="+voucher-purchase-instructions"

=== modified file 'lib/lp/registry/browser/product.py'
=== modified file 'lib/lp/registry/browser/tests/pillar-views.txt'
=== modified file 'lib/lp/registry/model/product.py'
=== modified file 'lib/lp/registry/model/teammembership.py'
--- lib/lp/registry/model/teammembership.py	2010-09-29 00:26:02 +0000
+++ lib/lp/registry/model/teammembership.py	2010-10-04 14:19:56 +0000
@@ -45,8 +45,12 @@
     )
 from canonical.launchpad.mailnotification import MailWrapper
 from canonical.launchpad.webapp import canonical_url
+<<<<<<< TREE
 from lp.app.browser.tales import DurationFormatterAPI
 from lp.registry.errors import TeamMembershipTransitionError
+=======
+from lp.app.browser.tales import DurationFormatterAPI
+>>>>>>> MERGE-SOURCE
 from lp.registry.interfaces.person import (
     IPersonSet,
     TeamMembershipRenewalPolicy,

=== modified file 'lib/lp/services/scripts/base.py'
--- lib/lp/services/scripts/base.py	2010-09-26 13:18:24 +0000
+++ lib/lp/services/scripts/base.py	2010-10-04 14:19:56 +0000
@@ -395,6 +395,14 @@
             return True
         log.exception("Error loading %s" % control_url)
         return True
+    # Python 2.5 can return OSError. Under 2.6, this is wrapped into a
+    # URLError.
+    except OSError, error:
+        if error.errno == 2:
+            log.debug("Cronscript control file not found at %s", control_url)
+            return True
+        log.exception("Error loading %s" % control_url)
+        return True
     except URLError, error:
         if getattr(error.reason, 'errno', None) == 2:
             log.debug("Cronscript control file not found at %s", control_url)

=== modified file 'lib/lp/translations/browser/configure.zcml'
=== modified file 'lib/lp/translations/browser/potemplate.py'