Changeset 2687
- Timestamp:
- 04/12/06 08:35:31 (3 years ago)
- Files:
-
- django/trunk/django/contrib/admin/templatetags/admin_list.py (modified) (1 diff)
- django/trunk/django/core/meta/fields.py (modified) (1 diff)
- django/trunk/django/core/meta/__init__.py (modified) (1 diff)
- django/trunk/django/core/servers/basehttp.py (modified) (1 diff)
- django/trunk/django/utils/_threading_local.py (modified) (1 diff)
- django/trunk/docs/modpython.txt (modified) (1 diff)
- django/trunk/tests/doctest.py (modified) (2 diffs)
- django/trunk/tests/othertests/cache.py (modified) (1 diff)
- django/trunk/tests/testapp/models/basic.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/contrib/admin/templatetags/admin_list.py
r2649 r2687 80 80 header = lookup_opts.verbose_name 81 81 else: 82 func = getattr(cl.mod.Klass, field_name) # Let AttributeErrors prop ogate.82 func = getattr(cl.mod.Klass, field_name) # Let AttributeErrors propagate. 83 83 try: 84 84 header = func.short_description django/trunk/django/core/meta/fields.py
r2650 r2687 81 81 # A guide to Field parameters: 82 82 # 83 # * name: The name of the field specif ed in the model.83 # * name: The name of the field specified in the model. 84 84 # * attname: The attribute to use on the model object. This is the same as 85 85 # "name", except in the case of ForeignKeys, where "_id" is django/trunk/django/core/meta/__init__.py
r2650 r2687 1734 1734 # Sanity check -- Make sure the "parent" object exists. 1735 1735 # For example, make sure the Place exists for the Restaurant. 1736 # Let the ObjectDoesNotExist exception prop ogate up.1736 # Let the ObjectDoesNotExist exception propagate up. 1737 1737 lookup_kwargs = opts.one_to_one_field.rel.limit_choices_to 1738 1738 lookup_kwargs['%s__exact' % opts.one_to_one_field.rel.field_name] = obj_key django/trunk/django/core/servers/basehttp.py
r948 r2687 47 47 48 48 # Regular expression that matches `special' characters in parameters, the 49 # exist ance of which force quoting of the parameter value.49 # existence of which force quoting of the parameter value. 50 50 tspecials = re.compile(r'[ \(\)<>@,;:\\"/\[\]\?=]') 51 51 django/trunk/django/utils/_threading_local.py
r2580 r2687 150 150 151 151 # We need to create the thread dict in anticipation of 152 # __init__ being called, to make s ire we don't cal it152 # __init__ being called, to make sure we don't call it 153 153 # again ourselves. 154 154 dict = object.__getattribute__(self, '__dict__') django/trunk/docs/modpython.txt
r2312 r2687 191 191 192 192 When you use Apache/mod_python, errors will be caught by Django -- in other 193 words, they won't prop ogate to the Apache level and won't appear in the Apache193 words, they won't propagate to the Apache level and won't appear in the Apache 194 194 ``error_log``. 195 195 django/trunk/tests/doctest.py
r336 r2687 847 847 globs.update(extraglobs) 848 848 849 # Recursively exp ore `obj`, extracting DocTests.849 # Recursively explore `obj`, extracting DocTests. 850 850 tests = [] 851 851 self._find(tests, obj, name, module, source_lines, globs, {}) … … 1211 1211 for examplenum, example in enumerate(test.examples): 1212 1212 1213 # If REPORT_ONLY_FIRST_FAILURE is set, then sup ress1213 # If REPORT_ONLY_FIRST_FAILURE is set, then suppress 1214 1214 # reporting after the first failure. 1215 1215 quiet = (self.optionflags & REPORT_ONLY_FIRST_FAILURE and django/trunk/tests/othertests/cache.py
r367 r2687 16 16 assert cache.get("key") == "value" 17 17 18 # get with non-exist ant keys18 # get with non-existent keys 19 19 assert cache.get("does not exist") is None 20 20 assert cache.get("does not exist", "bang!") == "bang!" django/trunk/tests/testapp/models/basic.py
r2392 r2687 196 196 API_TESTS += """ 197 197 198 # You can manually specify the primary key when creating a new obje t198 # You can manually specify the primary key when creating a new object 199 199 >>> a101 = articles.Article(id=101, headline='Article 101', pub_date=datetime(2005, 7, 31, 12, 30, 45)) 200 200 >>> a101.save()
