Django

Code

Show
Ignore:
Timestamp:
06/26/08 10:11:55 (2 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7643-7662,7667-7668,7672-7682,7686-7693,7695-7698,7700-7702,7704-7706,7710,7712-7729,7731-7732,7738-7758,7760-7766 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7641 to /django/trunk:1-7767

  • django/branches/gis/django/contrib/auth/views.py

    r6394 r7768  
     1from django import oldforms 
     2from django.contrib.auth import REDIRECT_FIELD_NAME 
     3from django.contrib.auth.decorators import login_required 
    14from django.contrib.auth.forms import AuthenticationForm 
    25from django.contrib.auth.forms import PasswordResetForm, PasswordChangeForm 
    3 from django import oldforms 
     6from django.contrib.sites.models import Site, RequestSite 
     7from django.http import HttpResponseRedirect 
    48from django.shortcuts import render_to_response 
    59from django.template import RequestContext 
    6 from django.contrib.sites.models import Site, RequestSite 
    7 from django.http import HttpResponseRedirect 
    8 from django.contrib.auth.decorators import login_required 
    9 from django.contrib.auth import REDIRECT_FIELD_NAME 
     10from django.utils.http import urlquote 
    1011from django.utils.translation import ugettext as _ 
    1112 
    1213def login(request, template_name='registration/login.html', redirect_field_name=REDIRECT_FIELD_NAME): 
    1314    "Displays the login form and handles the login action." 
    14     manipulator = AuthenticationForm(request) 
     15    manipulator = AuthenticationForm() 
    1516    redirect_to = request.REQUEST.get(redirect_field_name, '') 
    1617    if request.POST: 
    …… 
    2324            from django.contrib.auth import login 
    2425            login(request, manipulator.get_user()) 
    25             request.session.delete_test_cookie() 
     26            if request.session.test_cookie_worked(): 
     27                request.session.delete_test_cookie() 
    2628            return HttpResponseRedirect(redirect_to) 
    2729    else: 
    …… 
    6264        from django.conf import settings 
    6365        login_url = settings.LOGIN_URL 
    64     return HttpResponseRedirect('%s?%s=%s' % (login_url, redirect_field_name, next)) 
     66    return HttpResponseRedirect('%s?%s=%s' % (login_url, urlquote(redirect_field_name), urlquote(next))) 
    6567 
    6668def password_reset(request, is_admin_site=False, template_name='registration/password_reset_form.html', 
    …… 
    7577                form.save(domain_override=request.META['HTTP_HOST']) 
    7678            else: 
    77                 form.save(email_template_name=email_template_name) 
     79                if Site._meta.installed: 
     80                    form.save(email_template_name=email_template_name) 
     81                else: 
     82                    form.save(domain_override=RequestSite(request).domain, email_template_name=email_template_name) 
    7883            return HttpResponseRedirect('%sdone/' % request.path) 
    7984    return render_to_response(template_name, {'form': oldforms.FormWrapper(form, new_data, errors)}, 

  • django/branches/gis/django/contrib/flatpages/models.py

    r7405 r7768  
    2727            (_('Advanced options'), {'classes': 'collapse', 'fields': ('enable_comments', 'registration_required', 'template_name')}), 
    2828        ) 
    29         list_filter = ('sites',) 
     29        list_display = ('url', 'title') 
     30        list_filter = ('sites', 'enable_comments', 'registration_required') 
    3031        search_fields = ('url', 'title') 
    3132 

  • django/branches/gis/django/contrib/formtools/tests.py

    r7354 r7768  
    2424 
    2525    def setUp(self): 
     26        self._old_root_urlconf = settings.ROOT_URLCONF 
    2627        settings.ROOT_URLCONF = 'django.contrib.formtools.test_urls' 
    2728        # Create a FormPreview instance to share between tests 
    …… 
    3031        self.input = input_template % (self.preview.unused_name('stage'), "%d") 
    3132 
     33    def tearDown(self): 
     34        settings.ROOT_URLCONF = self._old_root_urlconf 
     35         
    3236    def test_unused_name(self): 
    3337        """ 

  • django/branches/gis/django/contrib/formtools/wizard.py

    r7354 r7768  
    150150        # Use HIGHEST_PROTOCOL because it's the most efficient. It requires 
    151151        # Python 2.3, but Django requires 2.3 anyway, so that's OK. 
    152         pickled = pickle.dumps(data, protocol=pickle.HIGHEST_PROTOCOL) 
     152        pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL) 
    153153        return md5.new(pickled).hexdigest() 
    154154 

  • django/branches/gis/django/contrib/localflavor/ar/forms.py

    r7354 r7768  
    77from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES 
    88from django.utils.encoding import smart_unicode 
    9 from django.utils.translation import ugettext 
     9from django.utils.translation import ugettext_lazy as _ 
    1010 
    1111class ARProvinceSelect(Select): 
    …… 
    2525    """ 
    2626    default_error_messages = { 
    27         'invalid': ugettext("Enter a postal code in the format NNNN or ANNNNAAA."), 
     27        'invalid': _("Enter a postal code in the format NNNN or ANNNNAAA."), 
    2828    } 
    2929 
    …… 
    4747    """ 
    4848    default_error_messages = { 
    49         'invalid': ugettext("This field requires only numbers."), 
    50         'max_digits': ugettext("This field requires 7 or 8 digits."), 
     49        'invalid': _("This field requires only numbers."), 
     50        'max_digits': _("This field requires 7 or 8 digits."), 
    5151    } 
    5252 
    …… 
    7777    """ 
    7878    default_error_messages = { 
    79         'invalid': ugettext('Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.'), 
    80         'checksum': ugettext("Invalid CUIT."), 
     79        'invalid': _('Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.'), 
     80        'checksum': _("Invalid CUIT."), 
    8181    } 
    8282 

  • django/branches/gis/django/contrib/localflavor/au/forms.py

    r6990 r7768  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.newforms.util import smart_unicode 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 
    …… 
    1414    """Australian post code field.""" 
    1515    default_error_messages = { 
    16         'invalid': ugettext('Enter a 4 digit post code.'), 
     16        'invalid': _('Enter a 4 digit post code.'), 
    1717    } 
    1818 

  • django/branches/gis/django/contrib/localflavor/br/forms.py

    r6990 r7768  
    77from django.newforms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES 
    88from django.utils.encoding import smart_unicode 
    9 from django.utils.translation import ugettext as _ 
     9from django.utils.translation import ugettext_lazy as _ 
    1010import re 
    1111 

  • django/branches/gis/django/contrib/localflavor/ca/forms.py

    r7354 r7768  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.newforms.util import smart_unicode 
    8 from django.utils.translation import gettext, ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 
    …… 
    1515    """Canadian postal code field.""" 
    1616    default_error_messages = { 
    17         'invalid': gettext(u'Enter a postal code in the format XXX XXX.'), 
     17        'invalid': _(u'Enter a postal code in the format XXX XXX.'), 
    1818    } 
    1919 
    …… 
    8686    """ 
    8787    default_error_messages = { 
    88         'invalid': ugettext('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'), 
     88        'invalid': _('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'), 
    8989    } 
    9090 

  • django/branches/gis/django/contrib/localflavor/ch/forms.py

    r6990 r7768  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 
    …… 
    1414class CHZipCodeField(RegexField): 
    1515    default_error_messages = { 
    16         'invalid': ugettext('Enter a zip code in the format XXXX.'), 
     16        'invalid': _('Enter a zip code in the format XXXX.'), 
    1717    } 
    1818 
    …… 
    6262    """ 
    6363    default_error_messages = { 
    64         'invalid': ugettext('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.'), 
     64        'invalid': _('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.'), 
    6565    } 
    6666 

  • django/branches/gis/django/contrib/localflavor/cl/forms.py

    r6990 r7768  
    55from django.newforms import ValidationError 
    66from django.newforms.fields import RegexField, Select, EMPTY_VALUES 
    7 from django.utils.translation import ugettext 
     7from django.utils.translation import ugettext_lazy as _ 
    88from django.utils.encoding import smart_unicode 
    99 
    …… 
    2727    """ 
    2828    default_error_messages = { 
    29         'invalid': ugettext('Enter a valid Chilean RUT.'), 
    30         'strict': ugettext('Enter a valid Chilean RUT. The format is XX.XXX.XXX-X.'), 
    31         'checksum': ugettext('The Chilean RUT is not valid.'), 
     29        'invalid': _('Enter a valid Chilean RUT.'), 
     30        'strict': _('Enter a valid Chilean RUT. The format is XX.XXX.XXX-X.'), 
     31        'checksum': _('The Chilean RUT is not valid.'), 
    3232    } 
    3333 

  • django/branches/gis/django/contrib/localflavor/de/forms.py

    r6990 r7768  
    55from django.newforms import ValidationError 
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    7 from django.utils.translation import ugettext 
     7from django.utils.translation import ugettext_lazy as _ 
    88import re 
    99 
    …… 
    1212class DEZipCodeField(RegexField): 
    1313    default_error_messages = { 
    14         'invalid': ugettext('Enter a zip code in the format XXXXX.'), 
     14        'invalid': _('Enter a zip code in the format XXXXX.'), 
    1515    } 
    1616    def __init__(self, *args, **kwargs): 
    …… 
    3939    """ 
    4040    default_error_messages = { 
    41         'invalid': ugettext('Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.'), 
     41        'invalid': _('Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.'), 
    4242    } 
    4343 

  • django/branches/gis/django/contrib/localflavor/es/forms.py

    r7354 r7768  
    66from django.newforms import ValidationError 
    77from django.newforms.fields import RegexField, Select, EMPTY_VALUES 
    8 from django.utils.translation import ugettext as _ 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 

  • django/branches/gis/django/contrib/localflavor/fi/forms.py

    r6990 r7768  
    66from django.newforms import ValidationError 
    77from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99 
    1010class FIZipCodeField(RegexField): 
    1111    default_error_messages = { 
    12         'invalid': ugettext('Enter a zip code in the format XXXXX.'), 
     12        'invalid': _('Enter a zip code in the format XXXXX.'), 
    1313    } 
    1414    def __init__(self, *args, **kwargs): 
    …… 
    2626class FISocialSecurityNumber(Field): 
    2727    default_error_messages = { 
    28         'invalid': ugettext('Enter a valid Finnish social security number.'), 
     28        'invalid': _('Enter a valid Finnish social security number.'), 
    2929    } 
    3030 

  • django/branches/gis/django/contrib/localflavor/fr/forms.py

    r6990 r7768  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 
    …… 
    1313class FRZipCodeField(RegexField): 
    1414    default_error_messages = { 
    15         'invalid': ugettext('Enter a zip code in the format XXXXX.'), 
     15        'invalid': _('Enter a zip code in the format XXXXX.'), 
    1616    } 
    1717 

  • django/branches/gis/django/contrib/localflavor/is_/forms.py

    r6990 r7768  
    66from django.newforms.fields import RegexField, EMPTY_VALUES 
    77from django.newforms.widgets import Select 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99from django.utils.encoding import smart_unicode 
    1010 
    …… 
    1515    """ 
    1616    default_error_messages = { 
    17         'invalid': ugettext('Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.'), 
    18         'checksum': ugettext(u'The Icelandic identification number is not valid.'), 
     17        'invalid': _('Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.'), 
     18        'checksum': _(u'The Icelandic identification number is not valid.'), 
    1919    } 
    2020 

  • django/branches/gis/django/contrib/localflavor/it/forms.py

    r6990 r7768  
    55from django.newforms import ValidationError 
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    7 from django.utils.translation import ugettext 
     7from django.utils.translation import ugettext_lazy as _ 
    88from django.utils.encoding import smart_unicode 
    99from django.contrib.localflavor.it.util import ssn_check_digit, vat_number_check_digit 
    …… 
    1212class ITZipCodeField(RegexField): 
    1313    default_error_messages = { 
    14         'invalid': ugettext('Enter a valid zip code.'), 
     14        'invalid': _('Enter a valid zip code.'), 
    1515    } 
    1616    def __init__(self, *args, **kwargs): 
    …… 
    2828class ITProvinceSelect(Select): 
    2929    """ 
    30     A Select widget that uses a list of IT regions as its choices. 
     30    A Select widget that uses a list of IT provinces as its choices. 
    3131    """ 
    3232    def __init__(self, attrs=None): 
    …… 
    4141    """ 
    4242    default_error_messages = { 
    43         'invalid': ugettext(u'Enter a valid Social Security number.'), 
     43        'invalid': _(u'Enter a valid Social Security number.'), 
    4444    } 
    4545 
    …… 
    6666    """ 
    6767    default_error_messages = { 
    68         'invalid': ugettext(u'Enter a valid VAT number.'), 
     68        'invalid': _(u'Enter a valid VAT number.'), 
    6969    } 
    7070 

  • django/branches/gis/django/contrib/localflavor/jp/forms.py

    r7176 r7768  
    55from django.core import validators 
    66from django.newforms import ValidationError 
    7 from django.utils.translation import ugettext 
     7from django.utils.translation import ugettext_lazy as _ 
    88from django.newforms.fields import RegexField, Select 
    99 
    …… 
    1515    """ 
    1616    default_error_messages = { 
    17         'invalid': ugettext('Enter a postal code in the format XXXXXXX or XXX-XXXX.'), 
     17        'invalid': _('Enter a postal code in the format XXXXXXX or XXX-XXXX.'), 
    1818    } 
    1919 

  • django/branches/gis/django/contrib/localflavor/nl/forms.py

    r7354 r7768  
    77from django.newforms import ValidationError 
    88from django.newforms.fields import Field, Select, EMPTY_VALUES 
    9 from django.utils.translation import ugettext as _ 
     9from django.utils.translation import ugettext_lazy as _ 
    1010from django.utils.encoding import smart_unicode 
    1111 

  • django/branches/gis/django/contrib/localflavor/no/forms.py

    r6990 r7768  
    66from django.newforms import ValidationError 
    77from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99 
    1010class NOZipCodeField(RegexField): 
    1111    default_error_messages = { 
    12         'invalid': ugettext('Enter a zip code in the format XXXX.'), 
     12        'invalid': _('Enter a zip code in the format XXXX.'), 
    1313    } 
    1414 
    …… 
    3131    """ 
    3232    default_error_messages = { 
    33         'invalid': ugettext(u'Enter a valid Norwegian social security number.'), 
     33        'invalid': _(u'Enter a valid Norwegian social security number.'), 
    3434    } 
    3535 

  • django/branches/gis/django/contrib/localflavor/pe/forms.py

    r7354 r7768  
    66from django.newforms import ValidationError 
    77from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99 
    1010class PEDepartmentSelect(Select): 
    …… 
    2121    """ 
    2222    default_error_messages = { 
    23         'invalid': ugettext("This field requires only numbers."), 
    24         'max_digits': ugettext("This field requires 8 digits."), 
     23        'invalid': _("This field requires only numbers."), 
     24        'max_digits': _("This field requires 8 digits."), 
    2525    } 
    2626 
    …… 
    4949    """ 
    5050    default_error_messages = { 
    51         'invalid': ugettext("This field requires only numbers."), 
    52         'max_digits': ugettext("This field requires 11 digits."), 
     51        'invalid': _("This field requires only numbers."), 
     52        'max_digits': _("This field requires 11 digits."), 
    5353    } 
    5454 

  • django/branches/gis/django/contrib/localflavor/pl/forms.py

    r6990 r7768  
    77from django.newforms import ValidationError 
    88from django.newforms.fields import Select, RegexField 
    9 from django.utils.translation import ugettext as _ 
     9from django.utils.translation import ugettext_lazy as _ 
    1010 
    1111class PLVoivodeshipSelect(Select): 

  • django/branches/gis/django/contrib/localflavor/sk/forms.py

    r6990 r7768  
    44 
    55from django.newforms.fields import Select, RegexField 
    6 from django.utils.translation import ugettext 
     6from django.utils.translation import ugettext_lazy as _ 
    77 
    88class SKRegionSelect(Select): 
    …… 
    2828    """ 
    2929    default_error_messages = { 
    30         'invalid': ugettext(u'Enter a postal code in the format XXXXX or XXX XX.'), 
     30        'invalid': _(u'Enter a postal code in the format XXXXX or XXX XX.'), 
    3131    } 
    3232 

  • django/branches/gis/django/contrib/localflavor/uk/forms.py

    r6990 r7768  
    77from django.newforms.fields import CharField, Select 
    88from django.newforms import ValidationError 
    9 from django.utils.translation import ugettext 
     9from django.utils.translation import ugettext_lazy as _ 
    1010 
    1111class UKPostcodeField(CharField): 
    …… 
    1919    """ 
    2020    default_error_messages = { 
    21         'invalid': ugettext(u'Enter a valid postcode.'), 
     21        'invalid': _(u'Enter a valid postcode.'), 
    2222    } 
    2323    outcode_pattern = '[A-PR-UWYZ]([0-9]{1,2}|([A-HIK-Y][0-9](|[0-9]|[ABEHMNPRVWXY]))|[0-9][A-HJKSTUW])' 

  • django/branches/gis/django/contrib/localflavor/uk/uk_regions.py

    r7354 r7768  
    66    Scottish regions: http://en.wikipedia.org/wiki/Regions_and_districts_of_Scotland 
    77""" 
    8 from django.utils.translation import ugettext as _ 
     8from django.utils.translation import ugettext_lazy as _ 
    99 
    1010ENGLAND_REGION_CHOICES = ( 

  • django/branches/gis/django/contrib/localflavor/us/forms.py

    r6990 r7768  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 
    …… 
    1414class USZipCodeField(RegexField): 
    1515    default_error_messages = { 
    16         'invalid': ugettext('Enter a zip code in the format XXXXX or XXXXX-XXXX.'), 
     16        'invalid': _('Enter a zip code in the format XXXXX or XXXXX-XXXX.'), 
    1717    } 
    1818 
    …… 
    5252    """ 
    5353    default_error_messages = { 
    54         'invalid': ugettext('Enter a valid U.S. Social Security number in XXX-XX-XXXX format.'), 
     54        'invalid': _('Enter a valid U.S. Social Security number in XXX-XX-XXXX format.'), 
    5555    } 
    5656 

  • django/branches/gis/django/contrib/redirects/models.py

    r6018 r7768  
    1818 
    1919    class Admin: 
     20        list_display = ('old_path', 'new_path') 
    2021        list_filter = ('site',) 
    2122        search_fields = ('old_path', 'new_path') 

  • django/branches/gis/django/contrib/sessions/backends/base.py

    r7642 r7768  
    66import time 
    77from datetime import datetime, timedelta 
    8 from django.conf import settings 
    9 from django.core.exceptions import SuspiciousOperation 
    10  
    118try: 
    129    import cPickle as pickle 
    1310except ImportError: 
    1411    import pickle 
     12 
     13from django.conf import settings 
     14from django.core.exceptions import SuspiciousOperation 
     15 
    1516 
    1617class SessionBase(object): 
    …… 
    8788        except: 
    8889            return {} 
     90 
     91    def update(self, dict_): 
     92        self._session.update(dict_) 
     93        self.modified = True 
     94 
     95    def has_key(self, key): 
     96        return self._session.has_key(key) 
     97 
     98    def values(self): 
     99        return self._session.values() 
     100 
     101    def iterkeys(self): 
     102        return self._session.iterkeys() 
     103 
     104    def itervalues(self): 
     105        return self._session.itervalues() 
     106 
     107    def iteritems(self): 
     108        return self._session.iteritems() 
    89109 
    90110    def _get_new_session_key(self): 
    …… 
    151171    def set_expiry(self, value): 
    152172        """ 
    153         Sets a custom expiration for the session. ``value`` can be an integer, a 
    154         Python ``datetime`` or ``timedelta`` object or ``None``. 
     173        Sets a custom expiration for the session. ``value`` can be an integer, 
     174        a Python ``datetime`` or ``timedelta`` object or ``None``. 
    155175 
    156176        If ``value`` is an integer, the session will expire after that many 

  • django/branches/gis/django/contrib/sessions/backends/cache.py

    r7642 r7768  
    22from django.contrib.sessions.backends.base import SessionBase 
    33from django.core.cache import cache 
     4 
    45 
    56class SessionStore(SessionBase): 

  • django/branches/gis/django/contrib/sessions/backends/db.py

    r7642 r7768  
     1import datetime 
     2 
    13from django.conf import settings 
    24from django.contrib.sessions.models import Session 
    35from django.contrib.sessions.backends.base import SessionBase 
    46from django.core.exceptions import SuspiciousOperation 
    5 import datetime 
     7 
    68 
    79class SessionStore(SessionBase): 
    810    """ 
    9     Implements database session store 
     11    Implements database session store. 
    1012    """ 
    1113    def __init__(self, session_key=None): 

  • django/branches/gis/django/contrib/sessions/backends/file.py

    r7354 r7768  
    11import os 
    22import tempfile 
     3 
    34from django.conf import settings 
    45from django.contrib.sessions.backends.base import SessionBase 
    56from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured 
     7 
    68 
    79class SessionStore(SessionBase): 
    …… 
    1618        # Make sure the storage path is valid. 
    1719        if not os.path.isdir(self.storage_path): 
    18             raise ImproperlyConfigured("The session storage path %r doesn't exist. "\ 
    19                                        "Please set your SESSION_FILE_PATH setting "\ 
    20                                        "to an existing directory in which Django "\ 
    21                                        "can store session data." % self.storage_path) 
     20            raise ImproperlyConfigured( 
     21                "The session storage path %r doesn't exist. Please set your" 
     22                " SESSION_FILE_PATH setting to an existing directory in which" 
     23                " Django can store session data." % self.storage_path) 
    2224 
    2325        self.file_prefix = settings.SESSION_COOKIE_NAME 
    …… 
    3234 
    3335        # Make sure we're not vulnerable to directory traversal. Session keys 
    34         # should always be md5s, so they should never contain directory components. 
     36        # should always be md5s, so they should never contain directory 
     37        # components. 
    3538        if os.path.sep in session_key: 
    36             raise SuspiciousOperation("Invalid characters (directory components) in session key") 
     39            raise SuspiciousOperation( 
     40                "Invalid characters (directory components) in session key") 
    3741 
    3842        return os.path.join(self.storage_path, self.file_prefix + session_key) 

  • django/branches/gis/django/contrib/sessions/middleware.py

    r7642 r7768  
    77TEST_COOKIE_NAME = 'testcookie' 
    88TEST_COOKIE_VALUE = 'worked' 
     9 
    910 
    1011class SessionMiddleware(object): 
    …… 
    4142                        path=settings.SESSION_COOKIE_PATH, 
    4243                        secure=settings.SESSION_COOKIE_SECURE or None) 
    43  
    4444        return response 

  • django/branches/gis/django/contrib/sessions/models.py

    r7176 r7768  
    77from django.conf import settings 
    88 
     9 
    910class SessionManager(models.Manager): 
    1011    def encode(self, session_dict): 
    11         "Returns the given session dictionary pickled and encoded as a string." 
     12        """ 
     13        Returns the given session dictionary pickled and encoded as a string. 
     14        """ 
    1215        pickled = pickle.dumps(session_dict) 
    1316        pickled_md5 = md5.new(pickled + settings.SECRET_KEY).hexdigest() 
    …… 
    2124            s.delete() # Clear sessions with no data. 
    2225        return s 
     26 
    2327 
    2428class Session(models.Model): 
    …… 
    3943    on the Django website). 
    4044    """ 
    41     session_key = models.CharField(_('session key'), max_length=40, primary_key=True) 
     45    session_key = models.CharField(_('session key'), max_length=40, 
     46                                   primary_key=True) 
    4247    session_data = models.TextField(_('session data')) 
    4348    expire_date = models.DateTimeField(_('expire date')) 

  • django/branches/gis/django/contrib/sessions/tests.py

    r7642 r7768  
    9090'does not exist' 
    9191 
     92 
     93>>> s.get('update key', None) 
     94 
     95# test .update() 
     96>>> s.modified = s.accessed = False   # Reset to pretend this wasn't accessed previously 
     97>>> s.update({'update key':1}) 
     98>>> s.accessed, s.modified 
     99(True, True) 
     100>>> s.get('update key', None) 
     1011 
     102 
     103# test .has_key() 
     104>>> s.modified = s.accessed = False   # Reset to pretend this wasn't accessed previously 
     105>>> s.has_key('update key') 
     106True 
     107>>> s.accessed, s.modified 
     108(True, False) 
     109 
     110# test .values() 
     111>>> s = SessionBase() 
     112>>> s.values() 
     113[] 
     114>>> s.accessed 
     115True 
     116>>> s['x'] = 1 
     117>>> s.values() 
     118[1] 
     119 
     120# test .iterkeys() 
     121>>> s.accessed = False 
     122>>> i = s.iterkeys() 
     123>>> hasattr(i,'__iter__') 
     124True 
     125>>> s.accessed 
     126True 
     127>>> list(i) 
     128['x'] 
     129 
     130# test .itervalues() 
     131>>> s.accessed = False 
     132>>> i = s.itervalues() 
     133>>> hasattr(i,'__iter__') 
     134True 
     135>>> s.accessed 
     136True 
     137>>> list(i) 
     138[1] 
     139 
     140# test .iteritems() 
     141>>> s.accessed = False 
     142>>> i = s.iteritems() 
     143>>> hasattr(i,'__iter__') 
     144True 
     145>>> s.accessed 
     146True 
     147>>> list(i) 
     148[('x', 1)] 
     149 
     150  
     151 
    92152######################### 
    93153# Custom session expiry # 

  • django/branches/gis/django/contrib/sites/management.py

    r4265 r7768  
    1414        s = Site(domain="example.com", name="example.com")