Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #2109 -- Convert old-style classes to new-style classes through…

…out Django. Thanks, Nicola Larosa

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2abfd5dd586c4f6fb619de561b2194687021e256 1 parent 5edd133
@adrianholovaty adrianholovaty authored
Showing with 63 additions and 64 deletions.
  1. +3 −3 django/conf/__init__.py
  2. +1 −1  django/contrib/auth/middleware.py
  3. +1 −1  django/contrib/flatpages/middleware.py
  4. +1 −1  django/contrib/redirects/middleware.py
  5. +1 −1  django/contrib/sessions/middleware.py
  6. +1 −1  django/contrib/syndication/feeds.py
  7. +1 −1  django/core/cache/backends/base.py
  8. +3 −3 django/core/context_processors.py
  9. +1 −1  django/core/handlers/base.py
  10. +1 −1  django/core/paginator.py
  11. +4 −4 django/core/servers/basehttp.py
  12. +1 −1  django/core/urlresolvers.py
  13. +15 −15 django/core/validators.py
  14. +1 −1  django/db/backends/util.py
  15. +1 −1  django/db/models/__init__.py
  16. +1 −1  django/db/models/fields/__init__.py
  17. +2 −2 django/db/models/fields/related.py
  18. +2 −2 django/db/models/options.py
  19. +1 −1  django/db/models/query.py
  20. +4 −4 django/forms/__init__.py
  21. +1 −1  django/middleware/cache.py
  22. +1 −1  django/middleware/common.py
  23. +1 −1  django/middleware/doc.py
  24. +1 −1  django/middleware/gzip.py
  25. +1 −1  django/middleware/http.py
  26. +1 −1  django/middleware/locale.py
  27. +1 −1  django/middleware/transaction.py
  28. +4 −4 django/template/__init__.py
  29. +1 −1  django/template/context.py
  30. +1 −1  django/utils/datastructures.py
  31. +1 −1  django/utils/dateformat.py
  32. +2 −2 django/utils/feedgenerator.py
  33. +1 −2  tests/othertests/templates.py
View
6 django/conf/__init__.py
@@ -12,7 +12,7 @@
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
-class LazySettings:
+class LazySettings(object):
"""
A lazy proxy for either global Django settings or a custom settings object.
The user can manually configure settings prior to using them. Otherwise,
@@ -67,7 +67,7 @@ def configure(self, default_settings=global_settings, **options):
setattr(holder, name, value)
self._target = holder
-class Settings:
+class Settings(object):
def __init__(self, settings_module):
# update this dict from global settings (but only for ALL_CAPS settings)
for setting in dir(global_settings):
@@ -112,7 +112,7 @@ def __init__(self, settings_module):
def get_all_members(self):
return dir(self)
-class UserSettingsHolder:
+class UserSettingsHolder(object):
"""
Holder for user configured settings.
"""
View
2  django/contrib/auth/middleware.py
@@ -12,7 +12,7 @@ def __get__(self, request, obj_type=None):
self._user = AnonymousUser()
return self._user
-class AuthenticationMiddleware:
+class AuthenticationMiddleware(object):
def process_request(self, request):
assert hasattr(request, 'session'), "The Django authentication middleware requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
request.__class__.user = LazyUser()
View
2  django/contrib/flatpages/middleware.py
@@ -2,7 +2,7 @@
from django.http import Http404
from django.conf import settings
-class FlatpageFallbackMiddleware:
+class FlatpageFallbackMiddleware(object):
def process_response(self, request, response):
if response.status_code != 404:
return response # No need to check for a flatpage for non-404 responses.
View
2  django/contrib/redirects/middleware.py
@@ -2,7 +2,7 @@
from django import http
from django.conf import settings
-class RedirectFallbackMiddleware:
+class RedirectFallbackMiddleware(object):
def process_response(self, request, response):
if response.status_code != 404:
return response # No need to check for a redirect for non-404 responses.
View
2  django/contrib/sessions/middleware.py
@@ -64,7 +64,7 @@ def _get_session(self):
_session = property(_get_session)
-class SessionMiddleware:
+class SessionMiddleware(object):
def process_request(self, request):
request.session = SessionWrapper(request.COOKIES.get(settings.SESSION_COOKIE_NAME, None))
View
2  django/contrib/syndication/feeds.py
@@ -12,7 +12,7 @@ def add_domain(domain, url):
class FeedDoesNotExist(ObjectDoesNotExist):
pass
-class Feed:
+class Feed(object):
item_pubdate = None
item_enclosure_url = None
feed_type = feedgenerator.DefaultFeed
View
2  django/core/cache/backends/base.py
@@ -5,7 +5,7 @@
class InvalidCacheBackendError(ImproperlyConfigured):
pass
-class BaseCache:
+class BaseCache(object):
def __init__(self, params):
timeout = params.get('timeout', 300)
try:
View
6 django/core/context_processors.py
@@ -36,7 +36,7 @@ def i18n(request):
context_extras['LANGUAGE_CODE'] = request.LANGUAGE_CODE
else:
context_extras['LANGUAGE_CODE'] = settings.LANGUAGE_CODE
-
+
from django.utils import translation
context_extras['LANGUAGE_BIDI'] = translation.get_language_bidi()
@@ -48,7 +48,7 @@ def request(request):
# PermWrapper and PermLookupDict proxy the permissions system into objects that
# the template system can understand.
-class PermLookupDict:
+class PermLookupDict(object):
def __init__(self, user, module_name):
self.user, self.module_name = user, module_name
def __repr__(self):
@@ -58,7 +58,7 @@ def __getitem__(self, perm_name):
def __nonzero__(self):
return self.user.has_module_perms(self.module_name)
-class PermWrapper:
+class PermWrapper(object):
def __init__(self, user):
self.user = user
def __getitem__(self, module_name):
View
2  django/core/handlers/base.py
@@ -3,7 +3,7 @@
from django import http
import sys
-class BaseHandler:
+class BaseHandler(object):
def __init__(self):
self._request_middleware = self._view_middleware = self._response_middleware = self._exception_middleware = None
View
2  django/core/paginator.py
@@ -4,7 +4,7 @@
class InvalidPage(Exception):
pass
-class ObjectPaginator:
+class ObjectPaginator(object):
"""
This class makes pagination easy. Feed it a QuerySet, plus the number of
objects you want on each page. Then read the hits and pages properties to
View
8 django/core/servers/basehttp.py
@@ -21,7 +21,7 @@
class WSGIServerException(Exception):
pass
-class FileWrapper:
+class FileWrapper(object):
"""Wrapper to convert file-like objects to iterables"""
def __init__(self, filelike, blksize=8192):
@@ -63,7 +63,7 @@ def _formatparam(param, value=None, quote=1):
else:
return param
-class Headers:
+class Headers(object):
"""Manage a collection of HTTP response headers"""
def __init__(self,headers):
if type(headers) is not ListType:
@@ -218,7 +218,7 @@ def is_hop_by_hop(header_name):
"""Return true if 'header_name' is an HTTP/1.1 "Hop-by-Hop" header"""
return _hoppish(header_name.lower())
-class ServerHandler:
+class ServerHandler(object):
"""Manage the invocation of a WSGI application"""
# Configuration parameters; can override per-subclass or per-instance
@@ -591,7 +591,7 @@ def log_message(self, format, *args):
return
sys.stderr.write("[%s] %s\n" % (self.log_date_time_string(), format % args))
-class AdminMediaHandler:
+class AdminMediaHandler(object):
"""
WSGI middleware that intercepts calls to the admin media directory, as
defined by the ADMIN_MEDIA_PREFIX setting, and serves those images.
View
2  django/core/urlresolvers.py
@@ -83,7 +83,7 @@ def __call__(self, match_obj):
raise NoReverseMatch("Value %r didn't match regular expression %r" % (value, test_regex))
return str(value) # TODO: Unicode?
-class RegexURLPattern:
+class RegexURLPattern(object):
def __init__(self, regex, callback, default_args=None):
# regex is a string representing a regular expression.
# callback is something like 'foo.views.news.stories.story_detail',
View
30 django/core/validators.py
@@ -237,7 +237,7 @@ def hasNoProfanities(field_data, all_data):
"Watch your mouth! The words %s are not allowed here.", plural) % \
get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in words_seen], 'and')
-class AlwaysMatchesOtherField:
+class AlwaysMatchesOtherField(object):
def __init__(self, other_field_name, error_message=None):
self.other = other_field_name
self.error_message = error_message or lazy_inter(gettext_lazy("This field must match the '%s' field."), self.other)
@@ -247,7 +247,7 @@ def __call__(self, field_data, all_data):
if field_data != all_data[self.other]:
raise ValidationError, self.error_message
-class ValidateIfOtherFieldEquals:
+class ValidateIfOtherFieldEquals(object):
def __init__(self, other_field, other_value, validator_list):
self.other_field, self.other_value = other_field, other_value
self.validator_list = validator_list
@@ -258,7 +258,7 @@ def __call__(self, field_data, all_data):
for v in self.validator_list:
v(field_data, all_data)
-class RequiredIfOtherFieldNotGiven:
+class RequiredIfOtherFieldNotGiven(object):
def __init__(self, other_field_name, error_message=gettext_lazy("Please enter something for at least one field.")):
self.other, self.error_message = other_field_name, error_message
self.always_test = True
@@ -267,7 +267,7 @@ def __call__(self, field_data, all_data):
if not all_data.get(self.other, False) and not field_data:
raise ValidationError, self.error_message
-class RequiredIfOtherFieldsGiven:
+class RequiredIfOtherFieldsGiven(object):
def __init__(self, other_field_names, error_message=gettext_lazy("Please enter both fields or leave them both empty.")):
self.other, self.error_message = other_field_names, error_message
self.always_test = True
@@ -282,7 +282,7 @@ class RequiredIfOtherFieldGiven(RequiredIfOtherFieldsGiven):
def __init__(self, other_field_name, error_message=gettext_lazy("Please enter both fields or leave them both empty.")):
RequiredIfOtherFieldsGiven.__init__(self, [other_field_name], error_message)
-class RequiredIfOtherFieldEquals:
+class RequiredIfOtherFieldEquals(object):
def __init__(self, other_field, other_value, error_message=None):
self.other_field = other_field
self.other_value = other_value
@@ -294,7 +294,7 @@ def __call__(self, field_data, all_data):
if all_data.has_key(self.other_field) and all_data[self.other_field] == self.other_value and not field_data:
raise ValidationError(self.error_message)
-class RequiredIfOtherFieldDoesNotEqual:
+class RequiredIfOtherFieldDoesNotEqual(object):
def __init__(self, other_field, other_value, error_message=None):
self.other_field = other_field
self.other_value = other_value
@@ -306,7 +306,7 @@ def __call__(self, field_data, all_data):
if all_data.has_key(self.other_field) and all_data[self.other_field] != self.other_value and not field_data:
raise ValidationError(self.error_message)
-class IsLessThanOtherField:
+class IsLessThanOtherField(object):
def __init__(self, other_field_name, error_message):
self.other, self.error_message = other_field_name, error_message
@@ -314,7 +314,7 @@ def __call__(self, field_data, all_data):
if field_data > all_data[self.other]:
raise ValidationError, self.error_message
-class UniqueAmongstFieldsWithPrefix:
+class UniqueAmongstFieldsWithPrefix(object):
def __init__(self, field_name, prefix, error_message):
self.field_name, self.prefix = field_name, prefix
self.error_message = error_message or gettext_lazy("Duplicate values are not allowed.")
@@ -324,7 +324,7 @@ def __call__(self, field_data, all_data):
if field_name != self.field_name and value == field_data:
raise ValidationError, self.error_message
-class IsAPowerOf:
+class IsAPowerOf(object):
"""
>>> v = IsAPowerOf(2)
>>> v(4, None)
@@ -342,7 +342,7 @@ def __call__(self, field_data, all_data):
if val != int(val):
raise ValidationError, gettext("This value must be a power of %s.") % self.power_of
-class IsValidFloat:
+class IsValidFloat(object):
def __init__(self, max_digits, decimal_places):
self.max_digits, self.decimal_places = max_digits, decimal_places
@@ -359,7 +359,7 @@ def __call__(self, field_data, all_data):
raise ValidationError, ngettext("Please enter a valid decimal number with at most %s decimal place.",
"Please enter a valid decimal number with at most %s decimal places.", self.decimal_places) % self.decimal_places
-class HasAllowableSize:
+class HasAllowableSize(object):
"""
Checks that the file-upload field data is a certain size. min_size and
max_size are measurements in bytes.
@@ -379,7 +379,7 @@ def __call__(self, field_data, all_data):
if self.max_size is not None and len(content) > self.max_size:
raise ValidationError, self.max_error_message
-class MatchesRegularExpression:
+class MatchesRegularExpression(object):
"""
Checks that the field matches the given regular-expression. The regex
should be in string format, not already compiled.
@@ -392,7 +392,7 @@ def __call__(self, field_data, all_data):
if not self.regexp.search(field_data):
raise ValidationError(self.error_message)
-class AnyValidator:
+class AnyValidator(object):
"""
This validator tries all given validators. If any one of them succeeds,
validation passes. If none of them succeeds, the given message is thrown
@@ -416,7 +416,7 @@ def __call__(self, field_data, all_data):
pass
raise ValidationError(self.error_message)
-class URLMimeTypeCheck:
+class URLMimeTypeCheck(object):
"Checks that the provided URL points to a document with a listed mime type"
class CouldNotRetrieve(ValidationError):
pass
@@ -441,7 +441,7 @@ def __call__(self, field_data, all_data):
raise URLMimeTypeCheck.InvalidContentType, gettext("The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'.") % {
'url': field_data, 'contenttype': content_type}
-class RelaxNGCompact:
+class RelaxNGCompact(object):
"Validate against a Relax NG compact schema"
def __init__(self, schema_path, additional_root_element=None):
self.schema_path = schema_path
View
2  django/db/backends/util.py
@@ -1,7 +1,7 @@
import datetime
from time import time
-class CursorDebugWrapper:
+class CursorDebugWrapper(object):
def __init__(self, cursor, db):
self.cursor = cursor
self.db = db
View
2  django/db/models/__init__.py
@@ -15,7 +15,7 @@
# Admin stages.
ADD, CHANGE, BOTH = 1, 2, 3
-class LazyDate:
+class LazyDate(object):
"""
Use in limit_choices_to to compare the field to dates calculated at run time
instead of when the model is loaded. For example::
View
2  django/db/models/fields/__init__.py
@@ -535,7 +535,7 @@ def get_manipulator_fields(self, opts, manipulator, change, name_prefix='', rel=
if not self.blank:
if rel:
# This validator makes sure FileFields work in a related context.
- class RequiredFileField:
+ class RequiredFileField(object):
def __init__(self, other_field_names, other_file_field_name):
self.other_field_names = other_field_names
self.other_file_field_name = other_file_field_name
View
4 django/db/models/fields/related.py
@@ -667,7 +667,7 @@ def contribute_to_related_class(self, cls, related):
def set_attributes_from_rel(self):
pass
-class ManyToOneRel:
+class ManyToOneRel(object):
def __init__(self, to, field_name, num_in_admin=3, min_num_in_admin=None,
max_num_in_admin=None, num_extra_on_change=1, edit_inline=False,
related_name=None, limit_choices_to=None, lookup_overrides=None, raw_id_admin=False):
@@ -704,7 +704,7 @@ def __init__(self, to, field_name, num_in_admin=0, edit_inline=False,
self.raw_id_admin = raw_id_admin
self.multiple = False
-class ManyToManyRel:
+class ManyToManyRel(object):
def __init__(self, to, num_in_admin=0, related_name=None,
filter_interface=None, limit_choices_to=None, raw_id_admin=False, symmetrical=True):
self.to = to
View
4 django/db/models/options.py
@@ -15,7 +15,7 @@
'unique_together', 'permissions', 'get_latest_by',
'order_with_respect_to', 'app_label')
-class Options:
+class Options(object):
def __init__(self, meta):
self.fields, self.many_to_many = [], []
self.module_name, self.verbose_name = None, None
@@ -195,7 +195,7 @@ def has_field_type(self, field_type, follow=None):
self._field_types[field_type] = False
return self._field_types[field_type]
-class AdminOptions:
+class AdminOptions(object):
def __init__(self, fields=None, js=None, list_display=None, list_filter=None,
date_hierarchy=None, save_as=False, ordering=None, search_fields=None,
save_on_top=False, list_select_related=False, manager=None, list_per_page=100):
View
2  django/db/models/query.py
@@ -546,7 +546,7 @@ def _clone(self, klass=None, **kwargs):
c._order = self._order
return c
-class QOperator:
+class QOperator(object):
"Base class for QAnd and QOr"
def __init__(self, *args):
self.args = args
View
8 django/forms/__init__.py
@@ -101,7 +101,7 @@ def do_html2python(self, new_data):
for field in self.fields:
field.convert_post_data(new_data)
-class FormWrapper:
+class FormWrapper(object):
"""
A wrapper linking a Manipulator to the template system.
This allows dictionary-style lookups of formfields. It also handles feeding
@@ -150,7 +150,7 @@ def _get_fields(self):
fields = property(_get_fields)
-class FormFieldWrapper:
+class FormFieldWrapper(object):
"A bridge between the template system and an individual form field. Used by FormWrapper."
def __init__(self, formfield, data, error_list):
self.formfield, self.data, self.error_list = formfield, data, error_list
@@ -211,7 +211,7 @@ def has_errors(self):
def html_combined_error_list(self):
return ''.join([field.html_error_list() for field in self.formfield_dict.values() if hasattr(field, 'errors')])
-class InlineObjectCollection:
+class InlineObjectCollection(object):
"An object that acts like a sparse list of form field collections."
def __init__(self, parent_manipulator, rel_obj, data, errors):
self.parent_manipulator = parent_manipulator
@@ -269,7 +269,7 @@ def fill(self):
self._collections = collections
-class FormField:
+class FormField(object):
"""Abstract class representing a form field.
Classes that extend FormField should define the following attributes:
View
2  django/middleware/cache.py
@@ -3,7 +3,7 @@
from django.utils.cache import get_cache_key, learn_cache_key, patch_response_headers
from django.http import HttpResponseNotModified
-class CacheMiddleware:
+class CacheMiddleware(object):
"""
Cache middleware. If this is enabled, each Django-powered page will be
cached for CACHE_MIDDLEWARE_SECONDS seconds. Cache is based on URLs.
View
2  django/middleware/common.py
@@ -3,7 +3,7 @@
from django.core.mail import mail_managers
import md5, os
-class CommonMiddleware:
+class CommonMiddleware(object):
"""
"Common" middleware for taking care of some basic operations:
View
2  django/middleware/doc.py
@@ -1,7 +1,7 @@
from django.conf import settings
from django import http
-class XViewMiddleware:
+class XViewMiddleware(object):
"""
Adds an X-View header to internal HEAD requests -- used by the documentation system.
"""
View
2  django/middleware/gzip.py
@@ -4,7 +4,7 @@
re_accepts_gzip = re.compile(r'\bgzip\b')
-class GZipMiddleware:
+class GZipMiddleware(object):
"""
This middleware compresses content if the browser allows gzip compression.
It sets the Vary header accordingly, so that caches will base their storage
View
2  django/middleware/http.py
@@ -1,6 +1,6 @@
import datetime
-class ConditionalGetMiddleware:
+class ConditionalGetMiddleware(object):
"""
Handles conditional GET operations. If the response has a ETag or
Last-Modified header, and the request has If-None-Match or
View
2  django/middleware/locale.py
@@ -3,7 +3,7 @@
from django.utils.cache import patch_vary_headers
from django.utils import translation
-class LocaleMiddleware:
+class LocaleMiddleware(object):
"""
This is a very simple middleware that parses a request
and decides what translation object to install in the current
View
2  django/middleware/transaction.py
@@ -1,7 +1,7 @@
from django.conf import settings
from django.db import transaction
-class TransactionMiddleware:
+class TransactionMiddleware(object):
"""
Transaction middleware. If this is enabled, each view function will be run
with commit_on_response activated - that way a save() doesn't do a direct
View
8 django/template/__init__.py
@@ -134,7 +134,7 @@ def __init__(self, source):
def reload(self):
return self.source
-class Template:
+class Template(object):
def __init__(self, template_string, origin=None):
"Compilation stage"
if settings.TEMPLATE_DEBUG and origin == None:
@@ -158,7 +158,7 @@ def compile_string(template_string, origin):
parser = parser_factory(lexer.tokenize())
return parser.parse()
-class Token:
+class Token(object):
def __init__(self, token_type, contents):
"The token_type must be TOKEN_TEXT, TOKEN_VAR or TOKEN_BLOCK"
self.token_type, self.contents = token_type, contents
@@ -376,7 +376,7 @@ def parser_factory(*args, **kwargs):
else:
return Parser(*args, **kwargs)
-class TokenParser:
+class TokenParser(object):
"""
Subclass this and implement the top() method to parse a template line. When
instantiating the parser, pass in the line from the Django template parser.
@@ -654,7 +654,7 @@ def resolve_variable(path, context):
del bits[0]
return current
-class Node:
+class Node(object):
def render(self, context):
"Return the node rendered as a string"
pass
View
2  django/template/context.py
@@ -7,7 +7,7 @@ class ContextPopException(Exception):
"pop() has been called more times than push()"
pass
-class Context:
+class Context(object):
"A stack container for variable context"
def __init__(self, dict_=None):
dict_ = dict_ or {}
View
2  django/utils/datastructures.py
@@ -1,4 +1,4 @@
-class MergeDict:
+class MergeDict(object):
"""
A simple class for creating new "virtual" dictionaries that actualy look
up values in more than one dictionary, passed in the constructor.
View
2  django/utils/dateformat.py
@@ -19,7 +19,7 @@
re_formatchars = re.compile(r'(?<!\\)([aABdDfFgGhHiIjlLmMnNOPrsStTUwWyYzZ])')
re_escaped = re.compile(r'\\(.)')
-class Formatter:
+class Formatter(object):
def format(self, formatstr):
pieces = []
for i, piece in enumerate(re_formatchars.split(formatstr)):
View
4 django/utils/feedgenerator.py
@@ -36,7 +36,7 @@ def get_tag_uri(url, date):
tag = re.sub('#', '/', tag)
return 'tag:' + tag
-class SyndicationFeed:
+class SyndicationFeed(object):
"Base class for all syndication feeds. Subclasses should provide write()"
def __init__(self, title, link, description, language=None, author_email=None,
author_name=None, author_link=None, subtitle=None, categories=None,
@@ -108,7 +108,7 @@ def latest_post_date(self):
else:
return datetime.datetime.now()
-class Enclosure:
+class Enclosure(object):
"Represents an RSS enclosure"
def __init__(self, url, length, mime_type):
"All args are expected to be Python Unicode objects"
View
3  tests/othertests/templates.py
@@ -169,8 +169,7 @@ def method(self):
'comment-tag05': ("foo{% comment %} {% somerandomtag %} {% endcomment %}", {}, "foo"),
### CYCLE TAG #############################################################
- #'cycleXX': ('', {}, ''),
- 'cycle01': ('{% cycle a, %}', {}, 'a'),
+ 'cycle01': ('{% cycle a %}', {}, template.TemplateSyntaxError),
'cycle02': ('{% cycle a,b,c as abc %}{% cycle abc %}', {}, 'ab'),
'cycle03': ('{% cycle a,b,c as abc %}{% cycle abc %}{% cycle abc %}', {}, 'abc'),
'cycle04': ('{% cycle a,b,c as abc %}{% cycle abc %}{% cycle abc %}{% cycle abc %}', {}, 'abca'),

0 comments on commit 2abfd5d

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