Django

Code

Ticket #6481: 0006-Fix-import-and-syntax-errors.patch

File 0006-Fix-import-and-syntax-errors.patch, 12.1 kB (added by Bastian Kleineidam <calvin@debian.org>, 7 months ago)

  • a/django/contrib/admin/views/decorators.py

    old new  
    55from django.shortcuts import render_to_response 
    66from django.utils.translation import ugettext_lazy, ugettext as _ 
    77from django.utils.safestring import mark_safe 
    8 import base64, datetime, md5 
     8import base64, md5 
    99import cPickle as pickle 
    1010 
    1111ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.") 

  • a/django/contrib/databrowse/plugins/calendars.py

    old new  
    88from django.utils.encoding import force_unicode 
    99from django.utils.safestring import mark_safe 
    1010from django.views.generic import date_based 
    11 import datetime 
    12 import time 
    1311 
    1412class CalendarPlugin(DatabrowsePlugin): 
    1513    def __init__(self, field_names=None): 

  • a/django/contrib/databrowse/plugins/fieldchoices.py

    old new  
    77from django.utils.encoding import smart_str, force_unicode 
    88from django.utils.safestring import mark_safe 
    99from django.views.generic import date_based 
    10 import datetime 
    11 import time 
    1210import urllib 
    1311 
    1412class FieldChoicePlugin(DatabrowsePlugin): 

  • a/django/contrib/databrowse/views.py

    old new  
    22from django.http import Http404 
    33from django.shortcuts import render_to_response 
    44from django.contrib.databrowse.datastructures import EasyModel, EasyChoice 
    5 import datetime 
    6 import time 
    75 
    86########### 
    97# CHOICES # 

  • a/django/contrib/formtools/preview.py

    old new  
    33""" 
    44 
    55from django.conf import settings 
    6 from django.core.exceptions import ImproperlyConfigured 
    76from django.http import Http404 
    87from django.shortcuts import render_to_response 
    98from django.template.context import RequestContext 

  • a/django/contrib/formtools/tests.py

    old new  
    33from django import http 
    44from django.conf import settings 
    55from django.test import TestCase 
    6 from django.test.client import Client 
    7  
     6import unittest 
    87 
    98success_string = "Done was called!" 
    109test_data = {'field1': u'foo', 

  • a/django/contrib/humanize/templatetags/humanize.py

    old new  
    22from django.utils.encoding import force_unicode 
    33from django import template 
    44from django.template import defaultfilters 
    5 from django.conf import settings 
    6 from datetime import date, timedelta 
     5from datetime import date 
    76import re 
    87 
    98register = template.Library() 

  • a/django/contrib/localflavor/ar/forms.py

    old new  
    77from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES 
    88from django.utils.encoding import smart_unicode 
    99from django.utils.translation import ugettext 
    10 import re 
    1110 
    1211class ARProvinceSelect(Select): 
    1312    """ 

  • a/django/contrib/localflavor/generic/forms.py

    old new  
    1 from django import newforms as forms 
    2  
    3 DEFAULT_DATE_INPUT_FORMATS = ( 
    4     '%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06' 
    5     '%b %d %Y', '%b %d, %Y',            # 'Oct 25 2006', 'Oct 25, 2006' 
    6     '%d %b %Y', '%d %b, %Y',            # '25 Oct 2006', '25 Oct, 2006' 
    7     '%B %d %Y', '%B %d, %Y',            # 'October 25 2006', 'October 25, 2006' 
    8     '%d %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006' 
    9 ) 
    10  
    11 DEFAULT_DATETIME_INPUT_FORMATS = ( 
    12     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59' 
    13     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30' 
    14     '%Y-%m-%d',              # '2006-10-25' 
    15     '%d/%m/%Y %H:%M:%S',     # '25/10/2006 14:30:59' 
    16     '%d/%m/%Y %H:%M',        # '25/10/2006 14:30' 
    17     '%d/%m/%Y',              # '25/10/2006' 
    18     '%d/%m/%y %H:%M:%S',     # '25/10/06 14:30:59' 
    19     '%d/%m/%y %H:%M',        # '25/10/06 14:30' 
    20     '%d/%m/%y',              # '25/10/06' 
    21 ) 
    22  
    23 class DateField(forms.DateField): 
    24     """ 
    25     A date input field which uses non-US date input formats by default. 
    26     """ 
    27     def __init__(self, input_formats=None, *args, **kwargs): 
    28         input_formats = input_formats or DEFAULT_DATE_INPUT_FORMATS 
    29         super(DateField, self).__init__(input_formats=input_formats, *args, **kwargs) 
    30  
    31 class DateTimeField(forms.DateTimeField): 
    32     """ 
    33     A date and time input field which uses non-US date and time input formats 
    34     by default. 
    35     """ 
    36     def __init__(self, input_formats=None, *args, **kwargs): 
    37         input_formats = input_formats or DEFAULT_DATETIME_INPUT_FORMATS 
    38         super(DateTimeField, self).__init__(input_formats=input_formats, *args, **kwargs) 
     1from django import newforms as forms 
     2 
     3DEFAULT_DATE_INPUT_FORMATS = ( 
     4    '%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06' 
     5    '%b %d %Y', '%b %d, %Y',            # 'Oct 25 2006', 'Oct 25, 2006' 
     6    '%d %b %Y', '%d %b, %Y',            # '25 Oct 2006', '25 Oct, 2006' 
     7    '%B %d %Y', '%B %d, %Y',            # 'October 25 2006', 'October 25, 2006' 
     8    '%d %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006' 
     9) 
     10 
     11DEFAULT_DATETIME_INPUT_FORMATS = ( 
     12    '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59' 
     13    '%Y-%m-%d %H:%M',        # '2006-10-25 14:30' 
     14    '%Y-%m-%d',              # '2006-10-25' 
     15    '%d/%m/%Y %H:%M:%S',     # '25/10/2006 14:30:59' 
     16    '%d/%m/%Y %H:%M',        # '25/10/2006 14:30' 
     17    '%d/%m/%Y',              # '25/10/2006' 
     18    '%d/%m/%y %H:%M:%S',     # '25/10/06 14:30:59' 
     19    '%d/%m/%y %H:%M',        # '25/10/06 14:30' 
     20    '%d/%m/%y',              # '25/10/06' 
     21) 
     22 
     23class DateField(forms.DateField): 
     24    """ 
     25    A date input field which uses non-US date input formats by default. 
     26    """ 
     27    def __init__(self, input_formats=None, *args, **kwargs): 
     28        input_formats = input_formats or DEFAULT_DATE_INPUT_FORMATS 
     29        super(DateField, self).__init__(input_formats=input_formats, *args, **kwargs) 
     30 
     31class DateTimeField(forms.DateTimeField): 
     32    """ 
     33    A date and time input field which uses non-US date and time input formats 
     34    by default. 
     35    """ 
     36    def __init__(self, input_formats=None, *args, **kwargs): 
     37        input_formats = input_formats or DEFAULT_DATETIME_INPUT_FORMATS 
     38        super(DateTimeField, self).__init__(input_formats=input_formats, *args, **kwargs) 

  • a/django/contrib/localflavor/jp/forms.py

    old new  
    77from django.utils.translation import ugettext 
    88from django.newforms.fields import RegexField, Select 
    99 
    10 import re 
    11  
    1210class JPPostalCodeField(RegexField): 
    1311    """ 
    1412    A form field that validates its input is a Japanese postcode. 

  • a/django/contrib/sessions/models.py

    old new  
    1 import os 
    2 import sys 
    3 import time 
    4 import datetime 
    51import base64 
    62import md5 
    7 import random 
    83import cPickle as pickle 
    94 
    105from django.db import models 

  • a/django/contrib/webdesign/tests.py

    old new  
    1414""" 
    1515 
    1616from django.contrib.webdesign.lorem_ipsum import * 
    17 import datetime 
    1817 
    1918if __name__ == '__main__': 
    2019    import doctest 

  • a/django/core/serializers/json.py

    old new  
    44 
    55import datetime 
    66from django.utils import simplejson 
    7 from django.utils.simplejson import decoder 
    87from django.core.serializers.python import Serializer as PythonSerializer 
    98from django.core.serializers.python import Deserializer as PythonDeserializer 
    109try: 

  • a/django/core/serializers/pyyaml.py

    old new  
    44Requires PyYaml (http://pyyaml.org/), but that's checked for in __init__. 
    55""" 
    66 
    7 import datetime 
    87from django.db import models 
    98from django.core.serializers.python import Serializer as PythonSerializer 
    109from django.core.serializers.python import Deserializer as PythonDeserializer 

  • a/django/db/backends/mysql/base.py

    old new  
    2121 
    2222from MySQLdb.converters import conversions 
    2323from MySQLdb.constants import FIELD_TYPE 
    24 import types 
    2524import re 
    2625 
    2726# Raise exceptions for database warnings if DEBUG is on 

  • a/django/test/_doctest.py

    old new  
    100100 
    101101import __future__ 
    102102 
    103 import sys, traceback, inspect, linecache, os, re, types 
     103import sys, traceback, inspect, linecache, os, re 
    104104import unittest, difflib, pdb, tempfile 
    105105import warnings 
    106106from StringIO import StringIO 

  • a/django/test/client.py

    old new  
    1 import datetime 
    21import sys 
    32from cStringIO import StringIO 
    4 from urlparse import urlparse 
    53from django.conf import settings 
    64from django.contrib.auth import authenticate, login 
    75from django.core.handlers.base import BaseHandler 

  • a/django/test/simple.py

    old new  
    146146    teardown_test_environment() 
    147147     
    148148    return len(result.failures) + len(result.errors) 
    149