ubuntuone-testing

Merge lp:~elopio/ubuntuone-testing/optionallocalconfig into lp:ubuntuone-testing

  1. optionallocalconfig
  2. Merge into trunk
Proposed by Leo Arias
Status: Merged
Approved by: Rick McBride
Approved revision: 59
Merged at revision: 59
Proposed branch: lp:~elopio/ubuntuone-testing/optionallocalconfig
Merge into: lp:ubuntuone-testing
Diff against target: 12 lines (+4/-1)
1 file modified
ubuntuone/web/tests/sst/shared/config.py (+4/-1)
To merge this branch: bzr merge lp:~elopio/ubuntuone-testing/optionallocalconfig
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
Review via email: mp+84030@code.launchpad.net

Commit message

Make the _localconfig optional, ignoring any import errors.

Description of the change

Make the _localconfig optional, ignoring any import errors.

To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) wrote :

OK cool.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/web/tests/sst/shared/config.py'
2--- ubuntuone/web/tests/sst/shared/config.py 2011-11-24 05:05:49 +0000
3+++ ubuntuone/web/tests/sst/shared/config.py 2011-11-30 22:42:23 +0000
4@@ -25,4 +25,7 @@
5
6 # You can overwrite the default configuration setting the variables on
7 # the file shared/_local_config.py.
8-from _localconfig import *
9+try:
10+ from _localconfig import *
11+except ImportError:
12+ pass

Subscribers

People subscribed via source and target branches