Context Navigation

Back to Ticket #2109

Ticket #2109: new_style.diff

File new_style.diff, 35.4 KB (added by nico@…, 18 years ago)

django/db/models/options.py

                  '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
 …
                 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):

django/db/models/fields/init.py

 from django.utils.translation import gettext, gettext_lazy, ngettext
 import datetime, os, time
 class NOT_PROVIDED:
+class NOT_PROVIDED(object):
     pass
 # Values for filter_interface.
 …
         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

django/db/models/fields/related.py

     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):
 …
         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

django/db/models/init.py

 # 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::

django/db/models/query.py

         c._order = self._order
         return c
 class QOperator:
+class QOperator(object):
     "Base class for QAnd and QOr"
     def __init__(self, *args):
         self.args = args

django/db/backends/sqlite3/introspection.py

 # This light wrapper "fakes" a dictionary interface, because some SQLite data
 # types include variables in them -- e.g. "varchar(30)" -- and can't be matched
 # as a simple dictionary lookup.
 class FlexibleFieldLookupDict:
+class FlexibleFieldLookupDict(object):
     def __getitem__(self, key):
         key = key.lower()
         try:

django/db/backends/util.py

 import datetime
 from time import time
 class CursorDebugWrapper:
+class CursorDebugWrapper(object):
     def __init__(self, cursor, db):
         self.cursor = cursor
         self.db = db

django/db/backends/mysql/base.py

 # This is an extra debug layer over MySQL queries, to display warnings.
 # It's only used when DEBUG=True.
 class MysqlDebugWrapper:
+class MysqlDebugWrapper(object):
     def __init__(self, cursor):
         self.cursor = cursor

django/db/backends/dummy/base.py

 class DatabaseError(Exception):
     pass
 class DatabaseWrapper:
+class DatabaseWrapper(object):
     cursor = complain
     _commit = complain
     _rollback = complain

django/conf/init.py

 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,
 …
             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):
 …
     def get_all_members(self):
         return dir(self)
 class UserSettingsHolder:
+class UserSettingsHolder(object):
     """
     Holder for user configured settings.
     """

django/forms/init.py

         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
 …
     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
 …
     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
 …
             self._collections = collections
 class FormField:
+class FormField(object):
     """Abstract class representing a form field.
     Classes that extend FormField should define the following attributes:
 …
                 {{ option.field }} {{ option.label }}<br />
             {% endfor %}
         """
         class RadioFieldRenderer:
+        class RadioFieldRenderer(object):
             def __init__(self, datalist, ul_class):
                 self.datalist, self.ul_class = datalist, ul_class
             def __str__(self):

django/core/servers/basehttp.py

 class WSGIServerException(Exception):
     pass
 class FileWrapper:
+class FileWrapper(object):
     """Wrapper to convert file-like objects to iterables"""
     def __init__(self, filelike, blksize=8192):
 …
     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:
 …
     """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
 …
             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.

django/core/context_processors.py

 # 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):
 …
     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):

django/core/urlresolvers.py

             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',

django/core/validators.py

             "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)
 …
         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
 …
             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
 …
         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
 …
     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
 …
         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
 …
         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
 …
         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.")
 …
             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)
 …
         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
 …
             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.
 …
         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.
 …
         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
 …
                 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
 …
             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

django/core/handlers/base.py

 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

django/core/management.py

 INVALID_PROJECT_NAMES = ('django', 'test')
 # Set up the terminal color scheme.
 class dummy: pass
+class dummy(object): pass
 style = dummy()
 style.ERROR = termcolors.make_style(fg='red', opts=('bold',))
 style.ERROR_OUTPUT = termcolors.make_style(fg='red', opts=('bold',))
 …
 del dummy
 def disable_termcolors():
     class dummy:
+    class dummy(object):
         def __getattr__(self, attr):
             return lambda x: x
     global style
 …
 inspectdb.help_doc = "Introspects the database tables in the given database and outputs a Django model module."
 inspectdb.args = ""
 class ModelErrorCollection:
+class ModelErrorCollection(object):
     def __init__(self, outfile=sys.stdout):
         self.errors = []
         self.outfile = outfile

django/core/cache/backends/base.py

 class InvalidCacheBackendError(ImproperlyConfigured):
     pass
 class BaseCache:
+class BaseCache(object):
     def __init__(self, params):
         timeout = params.get('timeout', 300)
         try:

django/core/paginator.py

 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

django/dispatch/saferef.py

                 weakSelf -- weak reference to the target object
                 weakFunc -- weak reference to the target function
         Class Attributes:
+        Class Attributes(object):
                 _allInstances -- class attribute pointing to all live
                         BoundMethodWeakref objects indexed by the class's
                         calculateKey(target) method applied to the target

django/dispatch/dispatcher.py

         True = 1==1
         False = 1==0
 class _Parameter:
+class _Parameter(object):
         """Used to represent default parameter values."""
         def __repr__(self):
                 return self.__class__.__name__

django/utils/feedgenerator.py

     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,
 …
         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"

django/utils/datastructures.py


1		class MergeDict:
	1	class MergeDict(object):
2	2	"""
3	3	A simple class for creating new "virtual" dictionaries that actualy look
4	4	up values in more than one dictionary, passed in the constructor.

django/utils/synch.py

 import threading
 class RWLock:
+class RWLock(object):
     """
     Classic implementation of reader-writer lock with preference to writers.

django/utils/dateformat.py

 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)):

django/contrib/auth/middleware.py

                 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()

django/contrib/redirects/middleware.py

 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.

django/contrib/syndication/feeds.py

 class FeedDoesNotExist(ObjectDoesNotExist):
     pass
 class Feed:
+class Feed(object):
     item_pubdate = None
     item_enclosure_url = None
     feed_type = feedgenerator.DefaultFeed

django/contrib/comments/templatetags/comments.py

         context[self.var_name] = comment_list
         return ''
 class DoCommentForm:
+class DoCommentForm(object):
     """
     Displays a comment form for the given params.
 …
                     raise template.TemplateSyntaxError, "%r tag got invalid parameter '%s'" % (tokens[0], option)
         return CommentFormNode(content_type, obj_id_lookup_var, obj_id, self.free, **kwargs)
 class DoCommentCount:
+class DoCommentCount(object):
     """
     Gets comment count for the given params and populates the template context
     with a variable containing that value, whose name is defined by the 'as'
 …
             raise template.TemplateSyntaxError, "Fourth argument in %r must be 'as'" % tokens[0]
         return CommentCountNode(package, module, var_name, obj_id, tokens[5], self.free)
 class DoGetCommentList:
+class DoGetCommentList(object):
     """
     Gets comments for the given params and populates the template context with a
     special comment_package variable, whose name is defined by the ``as``

django/contrib/flatpages/middleware.py

 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.

django/contrib/sessions/middleware.py

     _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))

django/contrib/admin/templatetags/log.py

         context[self.varname] = LogEntry.objects.filter(user__id__exact=self.user).select_related()[:self.limit]
         return ''
 class DoGetAdminLog:
+class DoGetAdminLog(object):
     """
     Populates a template variable with the admin log for the given criteria.

django/template/init.py

     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:
 …
     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
 …
         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.
 …
             del bits[0]
     return current
 class Node:
+class Node(object):
     def render(self, context):
         "Return the node rendered as a string"
         pass

django/template/context.py

     "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 {}

django/middleware/common.py

 from django.core.mail import mail_managers
 import md5, os
 class CommonMiddleware:
+class CommonMiddleware(object):
     """
     "Common" middleware for taking care of some basic operations:

django/middleware/gzip.py

 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

django/middleware/http.py

 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

django/middleware/locale.py

 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

django/middleware/cache.py

 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.

django/middleware/doc.py

 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.
     """

django/middleware/transaction.py

 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

tests/othertests/templates.py

 class SomeOtherException(Exception):
     pass
 class SomeClass:
+class SomeClass(object):
     def __init__(self):
         self.otherclass = OtherClass()
 …
     def method4(self):
         raise SomeOtherException
 class OtherClass:
+class OtherClass(object):
     def method(self):
         return "OtherClass.method"

tests/othertests/cache.py

 # functions/classes for complex data type tests
 def f():
     return 42
 class C:
+class C(object):
     def m(n):
         return 24

tests/doctest.py

 ##   a string (such as an object's docstring).  The DocTest class also
 ##   includes information about where the string was extracted from.
 class Example:
+class Example(object):
     """
     A single doctest example, consisting of source code and expected
     output.  `Example` defines the following attributes:
 …
         self.options = options
         self.exc_msg = exc_msg
 class DocTest:
+class DocTest(object):
     """
     A collection of doctest examples that should be run in a single
     namespace.  Each `DocTest` defines the following attributes:
 …
 ## 3. DocTestParser
 ######################################################################
 class DocTestParser:
+class DocTestParser(object):
     """
     A class used to parse strings containing doctest examples.
     """
 …
 ## 4. DocTest Finder
 ######################################################################
 class DocTestFinder:
+class DocTestFinder(object):
     """
     A class used to extract the DocTests that are relevant to a given
     object, from its docstring and the docstrings of its contained
 …
 ## 5. DocTest Runner
 ######################################################################
 class DocTestRunner:
+class DocTestRunner(object):
     """
     A class used to run DocTest test cases, and accumulate statistics.
     The `run` method is used to process a single DocTest case.  It
 …
                 t = t + t2
             d[name] = f, t
 class OutputChecker:
+class OutputChecker(object):
     """
     A class used to check the whether the actual output from a doctest
     example matches the expected output.  `OutputChecker` defines two
 …
 # This is provided only for backwards compatibility.  It's not
 # actually used in any way.
 class Tester:
+class Tester(object):
     def __init__(self, mod=None, globs=None, verbose=None,
                  isprivate=None, optionflags=0):
 …
 ######################################################################
 ## 10. Example Usage
 ######################################################################
 class _TestClass:
+class _TestClass(object):
     """
     A pointless class, for sanity-checking of docstring testing.

tests/runtests.py

             return normalize_long_ints(want) == normalize_long_ints(got)
         return ok
 class TestRunner:
+class TestRunner(object):
     def __init__(self, verbosity_level=0, which_tests=None):
         self.verbosity_level = verbosity_level
         self.which_tests = which_tests

Download in other formats:

Original Format

Issues

Context Navigation

Ticket #2109: new_style.diff

Download in other formats: