Changeset 7948 for django/branches/newforms-admin/django/newforms
- Timestamp:
- 07/18/08 10:47:10 (6 months ago)
- Files:
-
- django/branches/newforms-admin (modified) (1 prop)
- django/branches/newforms-admin/django/newforms/widgets.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7943 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7947
django/branches/newforms-admin/django/newforms/widgets.py
r7834 r7948 16 16 from django.utils.encoding import StrAndUnicode, force_unicode 17 17 from django.utils.safestring import mark_safe 18 from django.utils import datetime_safe 18 19 from util import flatatt 19 20 from urlparse import urljoin … … 297 298 value = '' 298 299 elif hasattr(value, 'strftime'): 300 value = datetime_safe.new_datetime(value) 299 301 value = value.strftime(self.format) 300 302 return super(DateTimeInput, self).render(name, value, attrs)
