Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

Removed some unused and duplicated imports.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2a7f7e1b97f45e8a5b0b38cf430a2062d59f62b5 1 parent c85c8f8
@gdub gdub authored
Showing with 0 additions and 5 deletions.
  1. +0 −5 django/contrib/admin/
5 django/contrib/admin/
@@ -1,12 +1,10 @@
import base64
import cPickle as pickle
-import datetime
import re
from django import http, template
from django.contrib.admin import ModelAdmin
from django.contrib.auth import authenticate, login
-from django.core.exceptions import ImproperlyConfigured
from django.db.models.base import ModelBase
from django.shortcuts import render_to_response
from django.utils.safestring import mark_safe
@@ -28,13 +26,11 @@ class NotRegistered(Exception):
def _encode_post_data(post_data):
- from django.conf import settings
pickled = pickle.dumps(post_data)
pickled_md5 = md5_constructor(pickled + settings.SECRET_KEY).hexdigest()
return base64.encodestring(pickled + pickled_md5)
def _decode_post_data(encoded_data):
- from django.conf import settings
encoded_data = base64.decodestring(encoded_data)
pickled, tamper_check = encoded_data[:-32], encoded_data[-32:]
if md5_constructor(pickled + settings.SECRET_KEY).hexdigest() != tamper_check:
@@ -205,7 +201,6 @@ def i18n_javascript(self, request):
This takes into account the USE_I18N setting. If it's set to False, the
generated JavaScript will be leaner and faster.
- from django.conf import settings
if settings.USE_I18N:
from django.views.i18n import javascript_catalog

0 comments on commit 2a7f7e1

Please sign in to comment.
Something went wrong with that request. Please try again.