Django

Code

Changeset 2688

Show
Ignore:
Timestamp:
04/12/06 08:39:34 (2 years ago)
Author:
adrian
Message:

magic-removal: Merged to [2687]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/django/contrib/admin/templatetags/admin_list.py

    r2651 r2688  
    8181                header = lookup_opts.verbose_name 
    8282            else: 
    83                 attr = getattr(cl.model, field_name) # Let AttributeErrors propogate. 
     83                attr = getattr(cl.model, field_name) # Let AttributeErrors propagate. 
    8484                try: 
    8585                    header = attr.short_description 

  • django/branches/magic-removal/django/core/servers/basehttp.py

    r2000 r2688  
    4747 
    4848# Regular expression that matches `special' characters in parameters, the 
    49 # existance of which force quoting of the parameter value. 
     49# existence of which force quoting of the parameter value. 
    5050tspecials = re.compile(r'[ \(\)<>@,;:\\"/\[\]\?=]') 
    5151 

  • django/branches/magic-removal/django/db/models/manipulators.py

    r2651 r2688  
    261261                # Sanity check -- Make sure the "parent" object exists. 
    262262                # For example, make sure the Place exists for the Restaurant. 
    263                 # Let the ObjectDoesNotExist exception propogate up. 
     263                # Let the ObjectDoesNotExist exception propagate up. 
    264264                lookup_kwargs = self.opts.one_to_one_field.rel.limit_choices_to 
    265265                lookup_kwargs['%s__exact' % self.opts.one_to_one_field.rel.field_name] = obj_key 

  • django/branches/magic-removal/django/db/models/query.py

    r2663 r2688  
    269269        assert kind in ("month", "year", "day"), "'kind' must be one of 'year', 'month' or 'day'." 
    270270        assert order in ('ASC', 'DESC'), "'order' must be either 'ASC' or 'DESC'." 
    271         # Let the FieldDoesNotExist exception propogate. 
     271        # Let the FieldDoesNotExist exception propagate. 
    272272        field = self.model._meta.get_field(field_name, many_to_many=False) 
    273273        assert isinstance(field, DateField), "%r isn't a DateField." % field_name 

  • django/branches/magic-removal/django/utils/_threading_local.py

    r2581 r2688  
    150150 
    151151        # We need to create the thread dict in anticipation of 
    152         # __init__ being called, to make sire we don't cal it 
     152        # __init__ being called, to make sure we don't call it 
    153153        # again ourselves. 
    154154        dict = object.__getattribute__(self, '__dict__') 

  • django/branches/magic-removal/docs/modpython.txt

    r2320 r2688  
    191191 
    192192When you use Apache/mod_python, errors will be caught by Django -- in other 
    193 words, they won't propogate to the Apache level and won't appear in the Apache 
     193words, they won't propagate to the Apache level and won't appear in the Apache 
    194194``error_log``. 
    195195 

  • django/branches/magic-removal/tests/doctest.py

    r336 r2688  
    847847            globs.update(extraglobs) 
    848848 
    849         # Recursively expore `obj`, extracting DocTests. 
     849        # Recursively explore `obj`, extracting DocTests. 
    850850        tests = [] 
    851851        self._find(tests, obj, name, module, source_lines, globs, {}) 
    …… 
    12111211        for examplenum, example in enumerate(test.examples): 
    12121212 
    1213             # If REPORT_ONLY_FIRST_FAILURE is set, then supress 
     1213            # If REPORT_ONLY_FIRST_FAILURE is set, then suppress 
    12141214            # reporting after the first failure. 
    12151215            quiet = (self.optionflags & REPORT_ONLY_FIRST_FAILURE and 

  • django/branches/magic-removal/tests/modeltests/basic/models.py

    r2485 r2688  
    331331API_TESTS += """ 
    332332 
    333 # You can manually specify the primary key when creating a new objet 
     333# You can manually specify the primary key when creating a new object. 
    334334>>> a101 = Article(id=101, headline='Article 101', pub_date=datetime(2005, 7, 31, 12, 30, 45)) 
    335335>>> a101.save() 

  • django/branches/magic-removal/tests/othertests/cache.py

    r367 r2688  
    1616assert cache.get("key") == "value" 
    1717 
    18 # get with non-existant keys 
     18# get with non-existent keys 
    1919assert cache.get("does not exist") is None 
    2020assert cache.get("does not exist", "bang!") == "bang!"