Merge lp:~abentley/launchpad/absolute-oops-import into lp:launchpad

Proposed by Aaron Bentley
Status: Merged
Approved by: Aaron Bentley
Approved revision: no longer in the source branch.
Merged at revision: 13683
Proposed branch: lp:~abentley/launchpad/absolute-oops-import
Merge into: lp:launchpad
Diff against target: 21 lines (+3/-1)
1 file modified
lib/canonical/launchpad/scripts/oops.py (+3/-1)
To merge this branch: bzr merge lp:~abentley/launchpad/absolute-oops-import
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+71423@code.launchpad.net

Commit message

Use absolute import when importing uniquefileallocator.

Description of the change

= Summary =
Fix #825485: canonical.launchpad.scripts.oops imports broken on natty & oneiric

== Proposed fix ==
Use an absolute import

== Pre-implementation notes ==
Suggested by lifeless

== Implementation details ==
None

== Tests ==
None

== Demo and Q/A ==
None

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/canonical/launchpad/scripts/oops.py

./lib/canonical/launchpad/scripts/oops.py
      40: Line exceeds 78 characters.
      40: local variable 'posix_oops_match' is assigned to but never used
      66: local variable 'found' is assigned to but never used
      40: E501 line too long (101 characters)
     136: E302 expected 2 blank lines, found 1
     146: W391 blank line at end of file

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/scripts/oops.py'
2--- lib/canonical/launchpad/scripts/oops.py 2011-08-10 06:50:52 +0000
3+++ lib/canonical/launchpad/scripts/oops.py 2011-08-12 20:47:42 +0000
4@@ -3,6 +3,8 @@
5
6 """Module docstring goes here."""
7
8+from __future__ import absolute_import
9+
10 __metaclass__ = type
11
12 __all__ = [
13@@ -18,7 +20,7 @@
14 import os
15 import re
16
17-from ...oops import uniquefileallocator
18+from oops import uniquefileallocator
19 from pytz import utc
20
21 from canonical.database.sqlbase import cursor