Raphaël Badin has proposed merging lp:~rvb/maas/fix-urls-import-1.2 into
lp:maas/1.2 with lp:~rvb/maas/fixture-error-1.2 as a prerequisite.
Commit message:
Fix importing from "django.conf.urls" to make it Django 1.3 compatible.
Requested reviews:
MAAS Maintainers (maas-maintainers)
For more details, see:
https://code.launchpad.net/~rvb/maas/fix-urls-import-1.2/+merge/134927
The methods in django.conf.urls.defaults in Django 1.3 are in django.conf.urls
in Django 1.4. There is backward compatiblity module in django 1.4 so that
importing from django.conf.urls.defaults will work in 1.3 and in 1.4.
(https://docs.djangoproject.com/en/dev/releases/1.4/#django-conf-urls-defaults)
This fixes import errors when running the tests in
src/maasserver/tests/test_apidoc.py when run on precise.
--
https://code.launchpad.net/~rvb/maas/fix-urls-import-1.2/+merge/134927
Your team MAAS Maintainers is requested to review the proposed merge of
lp:~rvb/maas/fix-urls-import-1.2 into lp:maas/1.2.
=== modified file 'src/maasserver/tests/test_apidoc.py'
--- src/maasserver/tests/test_apidoc.py 2012-11-02 09:48:02 +0000
+++ src/maasserver/tests/test_apidoc.py 2012-11-19 14:23:24 +0000
@@ -16,7 +16,7 @@
import new
from django.conf import settings
-from django.conf.urls import (
+from django.conf.urls.defaults import (
include,
patterns,
url,
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
