Fix deprecations

django-cms · May 3, 2015 · c563f2a · c563f2a
1 parent 84468b2
commit c563f2a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/cms/tests/menu.py b/cms/tests/menu.py
@@ -1006,6 +1006,8 @@ def get_request(self, user=None):
         attrs = {
             'user': user or AnonymousUser(),
             'REQUEST': {},
+            'POST': {},
+            'GET': {},
             'session': {},
         }
         return type('Request', (object,), attrs)
@@ -1154,6 +1156,8 @@ def setUp(self):
         attrs = {
             'user': self.user,
             'REQUEST': {},
+            'POST': {},
+            'GET': {},
             'session': {},
         }
         self.request = type('Request', (object,), attrs)

diff --git a/cms/tests/menu_page_viewperm.py b/cms/tests/menu_page_viewperm.py
@@ -260,6 +260,7 @@ def get_request(self, user=None, page=None):
         attrs = {
             'user': user or AnonymousUser(),
             'REQUEST': {},
+            'POST': {},
             'GET': {},
             'path': path,
             'session': {},

diff --git a/cms/tests/permmod.py b/cms/tests/permmod.py
@@ -828,6 +828,8 @@ def get_request(self, user=None):
         attrs = {
             'user': user or AnonymousUser(),
             'REQUEST': {},
+            'POST': {},
+            'GET': {},
             'session': {},
         }
         return type('Request', (object,), attrs)

diff --git a/cms/toolbar/toolbar.py b/cms/toolbar/toolbar.py
@@ -16,7 +16,11 @@
 from django.http import HttpResponseRedirect, HttpResponse
 from django.middleware.csrf import get_token
 from django.utils.translation import ugettext_lazy as _
-from django.utils.datastructures import SortedDict
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    from django.utils.datastructures import SortedDict as OrderedDict
 
 
 class CMSToolbarLoginForm(AuthenticationForm):
@@ -86,7 +90,7 @@ def __init__(self, request):
                 break
             parts.pop()
 
-        self.toolbars = SortedDict()
+        self.toolbars = OrderedDict()
         for key in toolbars:
             toolbar = toolbars[key](self.request, self, toolbars[key].check_current_app(key, self.app_name), self.app_name)
             self.toolbars[key] = toolbar

diff --git a/cms/toolbar_pool.py b/cms/toolbar_pool.py
@@ -3,12 +3,16 @@
 from cms.utils.conf import get_cms_setting
 from cms.utils.django_load import load, iterload_objects
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.datastructures import SortedDict
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    from django.utils.datastructures import SortedDict as OrderedDict
 
 
 class ToolbarPool(object):
     def __init__(self):
-        self.toolbars = SortedDict()
+        self.toolbars = OrderedDict()
         self._discovered = False
         self.force_register = False
 
@@ -27,7 +31,7 @@ def discover_toolbars(self):
         self._discovered = True
 
     def clear(self):
-        self.toolbars = SortedDict()
+        self.toolbars = OrderedDict()
         self._discovered = False
 
     def register(self, toolbar):

diff --git a/cms/utils/helpers.py b/cms/utils/helpers.py
@@ -130,9 +130,8 @@ def __get__(self, owner_self, owner_cls):
 
 
 def current_site(request):
-    if SITE_VAR in request.REQUEST:
-        site_pk = request.REQUEST[SITE_VAR]
-    else:
+    site_pk = request.GET.get(SITE_VAR, None) if request.GET.get(SITE_VAR, None) else request.POST.get(SITE_VAR, None)
+    if not site_pk:
         site_pk = request.session.get('cms_admin_site', None)
     if site_pk:
         try: