Merge lp:~michael.nelson/lazr.restful/663155-fix-django-settings-import into lp:lazr.restful

[Michael Nelson]

Load django.conf.settings rather than the settings module directly.

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.)

[Aaron Bentley (abentley)]

review: Approve

[Francis J. Lacoste (flacoste)]

I'm actually getting tests failure after merging this branch:

----------------------------------------------------------------------
File "/home/francis/canonical/lazr.restful/trunk/src/lazr/restful/docs/django.txt", line 65, in django.txt
Failed example:
    ignore = xmlconfig.string("""
      <configure xmlns="http://namespaces.zope.org/zope">
        <include package="lazr.restful" file="basic-site.zcml" />
        <include package="lazr.restful.frameworks" file="django.zcml" />
      </configure>
    """)
Exception raised:
    Traceback (most recent call last):
      ....

      File "/home/francis/canonical/lazr.restful/trunk/src/lazr/restful/framewor
ks/django.py", line 29, in <module>
        settings = __import__('django.conf', {}).conf.settings
    ZopeXMLConfigurationError: File "<string>", line 4.4-4.68
        ZopeXMLConfigurationError: File "/home/francis/canonical/lazr.restful/trunk/src/lazr/restful/frameworks/django.zcml", line 3.2-3.56
        ImportError: No module named conf
----------------------------------------------------------------------

review: Needs Resubmitting

Unmerged revisions

154. By Michael Nelson on 2010-10-20

Fix the import of django settings to use django.conf.settings rather than the project module directly.

=== modified file 'src/lazr/restful/frameworks/django.py'
--- src/lazr/restful/frameworks/django.py	2009-09-08 12:00:21 +0000
+++ src/lazr/restful/frameworks/django.py	2011-10-10 09:58:33 +0000
@@ -10,15 +10,12 @@
     'ManagerSequencer',
     ]
 
-import settings
-
 import martian
 
 from zope.interface import Interface, implements
 from zope.interface.common.sequence import IFiniteSequence
 from zope.location.interfaces import ILocation
 from zope.schema import getFieldsInOrder
-from zope.traversing.browser.interfaces import IAbsoluteURL
 from zope.traversing.browser.absoluteurl import AbsoluteURL
 
 import grokcore.component
@@ -29,10 +26,11 @@
     'django.core.exceptions', {}).core.exceptions.ObjectDoesNotExist
 Manager = __import__(
     'django.db.models.manager', {}).db.models.manager.Manager
+settings = __import__('django.conf', {}).conf.settings
 
 from lazr.restful import directives
 from lazr.restful.interfaces import (
-    IWebServiceLayer, IWebServiceClientRequest, IWebServiceConfiguration)
+    IWebServiceClientRequest, IWebServiceConfiguration)
 from lazr.restful.error import NotFoundView
 from lazr.restful.simple import BaseWebServiceConfiguration