Django

Code

Changeset 5514

Show
Ignore:
Timestamp:
06/22/07 22:18:22 (1 year ago)
Author:
mtredinnick
Message:

Fixed #4607 -- Tweaked checks for features missing in Python 2.3 to not assume
things Python does not guarantee. Patch from SmileyChris?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/views/main.py

    r5097 r5514  
    1414from django.utils.text import capfirst, get_text_list 
    1515import operator 
     16 
     17try: 
     18    set 
     19except NameError: 
     20    from sets import Set as set   # Python 2.3 fallback 
    1621 
    1722from django.contrib.admin.models import LogEntry, ADDITION, CHANGE, DELETION 
    …… 
    490495 
    491496def delete_stage(request, app_label, model_name, object_id): 
    492     import sets 
    493497    model = models.get_model(app_label, model_name) 
    494498    object_id = unquote(object_id) 
    …… 
    503507    # will also be deleted. 
    504508    deleted_objects = ['%s: <a href="../../%s/">%s</a>' % (capfirst(opts.verbose_name), object_id, escape(str(obj))), []] 
    505     perms_needed = sets.Set() 
     509    perms_needed = set() 
    506510    _get_deleted_objects(deleted_objects, perms_needed, request.user, obj, opts, 1) 
    507511 

  • django/trunk/django/contrib/auth/models.py

    r5073 r5514  
    55from django.utils.translation import gettext_lazy as _ 
    66import datetime 
     7 
     8try: 
     9    set 
     10except NameError: 
     11    from sets import Set as set   # Python 2.3 fallback 
    712 
    813def check_password(raw_password, enc_password): 
    …… 
    176181        "Returns a list of permission strings that this user has through his/her groups." 
    177182        if not hasattr(self, '_group_perm_cache'): 
    178             import sets 
    179183            cursor = connection.cursor() 
    180184            # The SQL below works out to the following, after DB quoting: 
    …… 
    201205                backend.quote_name('user_id'),) 
    202206            cursor.execute(sql, [self.id]) 
    203             self._group_perm_cache = sets.Set(["%s.%s" % (row[0], row[1]) for row in cursor.fetchall()]) 
     207            self._group_perm_cache = set(["%s.%s" % (row[0], row[1]) for row in cursor.fetchall()]) 
    204208        return self._group_perm_cache 
    205209 
    …… 
    207211        if not hasattr(self, '_perm_cache'): 
    208212            import sets 
    209             self._perm_cache = sets.Set(["%s.%s" % (p.content_type.app_label, p.codename) for p in self.user_permissions.select_related()]) 
     213            self._perm_cache = set(["%s.%s" % (p.content_type.app_label, p.codename) for p in self.user_permissions.select_related()]) 
    210214            self._perm_cache.update(self.get_group_permissions()) 
    211215        return self._perm_cache 

  • django/trunk/django/core/management.py

    r5451 r5514  
    88import os, re, shutil, sys, textwrap 
    99 
    10 # For Python 2.3 
    11 if not hasattr(__builtins__, 'set'): 
    12     from sets import Set as set 
     10try: 
     11    set 
     12except NameError: 
     13    from sets import Set as set   # Python 2.3 fallback 
    1314 
    1415# For backwards compatibility: get_version() used to be in this module. 

  • django/trunk/django/db/models/fields/related.py

    r5118 r5514  
    1111from django.dispatch import dispatcher 
    1212 
    13 # For Python 2.3 
    14 if not hasattr(__builtins__, 'set'): 
    15     from sets import Set as set 
     13try: 
     14    set 
     15except NameError: 
     16    from sets import Set as set   # Python 2.3 fallback 
    1617 
    1718# Values for Relation.edit_inline. 

  • django/trunk/django/db/models/query.py

    r5385 r5514  
    88import re 
    99 
    10 # For Python 2.3 
    11 if not hasattr(__builtins__, 'set'): 
    12     from sets import Set as set 
     10try: 
     11    set 
     12except NameError: 
     13    from sets import Set as set   # Python 2.3 fallback 
    1314 
    1415# The string constant used to separate query parts 

  • django/trunk/django/newforms/fields.py

    r5302 r5514  
    2828 
    2929try: 
    30     set # Only available in Python 2.4+ 
     30    set 
    3131except NameError: 
    32     from sets import Set as set # Python 2.3 fallback 
     32    from sets import Set as set   # Python 2.3 fallback 
    3333 
    3434try: 

  • django/trunk/django/newforms/widgets.py

    r5263 r5514  
    44 
    55try: 
    6     set # Only available in Python 2.4+ 
     6    set 
    77except NameError: 
    8     from sets import Set as set # Python 2.3 fallback 
     8    from sets import Set as set   # Python 2.3 fallback 
     9 
    910from itertools import chain 
    1011 

  • django/trunk/django/template/defaulttags.py

    r5511 r5514  
    99import re 
    1010 
    11 if not hasattr(__builtins__, 'reversed'): 
    12     # For Python 2.3. 
     11try: 
     12    reversed 
     13except NameError: 
     14    # Python 2.3 fallback. 
    1315    # From http://www.python.org/doc/current/tut/node11.html 
    1416    def reversed(data):