libdep-service

Merge lp:~jml/libdep-service/django-free-double into lp:libdep-service

  1. django-free-double
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: James Westby
Approved revision: 64
Merged at revision: 62
Proposed branch: lp:~jml/libdep-service/django-free-double
Merge into: lp:libdep-service
Diff against target: 12 lines (+1/-1)
1 file modified
djlibdep/test_double.py (+1/-1)
To merge this branch: bzr merge lp:~jml/libdep-service/django-free-double
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+129914@code.launchpad.net

Commit message

Don't assume DJANGO_SETTINGS_MODULE is in the environment

Description of the change

Ought to fix tips

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'djlibdep/test_double.py'
--- djlibdep/test_double.py 2012-10-16 14:10:00 +0000
+++ djlibdep/test_double.py 2012-10-16 14:39:22 +0000
@@ -32,7 +32,7 @@
32 super(LibdepServiceDouble, self).setUp()32 super(LibdepServiceDouble, self).setUp()
33 # Make sure that the double does not require Django33 # Make sure that the double does not require Django
34 env = dict(os.environ)34 env = dict(os.environ)
35 del env['DJANGO_SETTINGS_MODULE']35 env.pop('DJANGO_SETTINGS_MODULE', None)
36 tree = self.useFixture(36 tree = self.useFixture(
37 FileTree({'data.json': {CONTENT: json.dumps(self._data)}}))37 FileTree({'data.json': {CONTENT: json.dumps(self._data)}}))
38 data_path = tree.join('data.json')38 data_path = tree.join('data.json')

Subscribers

People subscribed via source and target branches