Permalink
Browse files

python 2.5 incompatibilities

  • Loading branch information...
1 parent f1296ce commit 86bbb63aadc38bbdc77372e614ee12c0ed458bc9 Jonas Obrist committed Feb 22, 2011
Showing with 7 additions and 8 deletions.
  1. +5 −8 cms/tests/placeholder.py
  2. +1 −0 cms/tests/toolbar.py
  3. +1 −0 cms/tests/views.py
View
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
+from __future__ import with_statement
from cms.exceptions import DuplicatePlaceholderWarning
from cms.models.placeholdermodel import Placeholder
from cms.test.testcases import CMSTestCase
-from cms.test.util.context_managers import (SettingsOverride,
- UserLoginContext)
+from cms.test.util.context_managers import SettingsOverride, UserLoginContext
from cms.utils.placeholder import PlaceholderNoAction, MLNGPlaceholderActions
from cms.utils.plugins import get_placeholders
from django.conf import settings
@@ -12,12 +12,9 @@
from django.core.urlresolvers import reverse
from django.template import TemplateSyntaxError, Template
from django.template.context import Context, RequestContext
-from testapp.fakemlng.models import Translations
-from testapp.placeholderapp.models import Example1, Example2, Example3, Example4, \
- Example5
-from project.fakemlng.models import Translations
-from project.placeholderapp.models import (Example1, Example2, Example3, Example4,
- Example5)
+from testapp.fakemlng.models import Translations, Translations
+from testapp.placeholderapp.models import (Example1, Example2, Example3, Example4,
+ Example5, Example1, Example2, Example3, Example4, Example5)
class PlaceholderTestCase(CMSTestCase):
View
@@ -1,3 +1,4 @@
+from __future__ import with_statement
from cms.test.testcases import SettingsOverrideTestCase
from cms.test.util.context_managers import UserLoginContext
from django.conf import settings
View
@@ -1,3 +1,4 @@
+from __future__ import with_statement
from cms.apphook_pool import apphook_pool
from cms.test.testcases import SettingsOverrideTestCase
from cms.test.util.context_managers import SettingsOverride

0 comments on commit 86bbb63

Please sign in to comment.