Merge lp:~michael.nelson/lazr.restful/663155-fix-django-settings-import into lp:lazr.restful
Proposed by
Michael Nelson
Status: | Rejected |
---|---|
Rejected by: | Francis J. Lacoste |
Proposed branch: | lp:~michael.nelson/lazr.restful/663155-fix-django-settings-import |
Merge into: | lp:lazr.restful |
Diff against target: |
31 lines (+2/-4) 1 file modified
src/lazr/restful/frameworks/django.py (+2/-4) |
To merge this branch: | bzr merge lp:~michael.nelson/lazr.restful/663155-fix-django-settings-import |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Francis J. Lacoste (community) | Needs Resubmitting | ||
Aaron Bentley (community) | Approve | ||
Review via email: mp+78810@code.launchpad.net |
Description of the change
Load django.
Note: as per bug 663155, this module could be updated to use absolute imports (and therefore simplify this and all tho similar imports in the file.)
To post a comment you must log in.
Unmerged revisions
- 154. By Michael Nelson
-
Fix the import of django settings to use django.
conf.settings rather than the project module directly.
I'm actually getting tests failure after merging this branch:
------- ------- ------- ------- ------- ------- ------- ------- ------- ------- francis/ canonical/ lazr.restful/ trunk/src/ lazr/restful/ docs/django. txt", line 65, in django.txt string( """ namespaces. zope.org/ zope"> "lazr.restful" file="basic- site.zcml" /> "lazr.restful. frameworks" file="django.zcml" />
File "/home/
Failed example:
ignore = xmlconfig.
<configure xmlns="http://
<include package=
<include package=
</configure>
""")
Exception raised:
Traceback (most recent call last):
....
File "/home/ francis/ canonical/ lazr.restful/ trunk/src/ lazr/restful/ framewor _('django. conf', {}).conf.settings igurationError: File "<string>", line 4.4-4.68
ZopeXMLConfigu rationError: File "/home/ francis/ canonical/ lazr.restful/ trunk/src/ lazr/restful/ frameworks/ django. zcml", line 3.2-3.56
ImportError: No module named conf ------- ------- ------- ------- ------- ------- ------- ------- -------
ks/django.py", line 29, in <module>
settings = __import_
ZopeXMLConf
-------