Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Negligible spacing cleanup in utils/dateparse.py

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 637a70fa7bad163de70bf4493b1ea73dd2147240 1 parent 286c5c8
@adrianholovaty adrianholovaty authored
Showing with 19 additions and 27 deletions.
  1. +19 −27 django/utils/dateparse.py
View
46 django/utils/dateparse.py
@@ -1,58 +1,51 @@
"""Functions to parse datetime objects."""
# We're using regular expressions rather than time.strptime because:
-# - they provide both validation and parsing,
-# - they're more flexible for datetimes,
-# - the date/datetime/time constructors produce friendlier error messages.
-
+# - They provide both validation and parsing.
+# - They're more flexible for datetimes.
+# - The date/datetime/time constructors produce friendlier error messages.
import datetime
import re
-
from django.utils.timezone import utc
from django.utils.tzinfo import FixedOffset
-
date_re = re.compile(
- r'(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$'
+ r'(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$'
)
-
datetime_re = re.compile(
- r'(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})'
- r'[T ](?P<hour>\d{1,2}):(?P<minute>\d{1,2})'
- r'(?::(?P<second>\d{1,2})(?:\.(?P<microsecond>\d{1,6})\d{0,6})?)?'
- r'(?P<tzinfo>Z|[+-]\d{1,2}:\d{1,2})?$'
+ r'(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})'
+ r'[T ](?P<hour>\d{1,2}):(?P<minute>\d{1,2})'
+ r'(?::(?P<second>\d{1,2})(?:\.(?P<microsecond>\d{1,6})\d{0,6})?)?'
+ r'(?P<tzinfo>Z|[+-]\d{1,2}:\d{1,2})?$'
)
-
time_re = re.compile(
- r'(?P<hour>\d{1,2}):(?P<minute>\d{1,2})'
- r'(?::(?P<second>\d{1,2})(?:\.(?P<microsecond>\d{1,6})\d{0,6})?)?'
+ r'(?P<hour>\d{1,2}):(?P<minute>\d{1,2})'
+ r'(?::(?P<second>\d{1,2})(?:\.(?P<microsecond>\d{1,6})\d{0,6})?)?'
)
-
def parse_date(value):
- """Parse a string and return a datetime.date.
+ """Parses a string and return a datetime.date.
- Raise ValueError if the input is well formatted but not a valid date.
- Return None if the input isn't well formatted.
+ Raises ValueError if the input is well formatted but not a valid date.
+ Returns None if the input isn't well formatted.
"""
match = date_re.match(value)
if match:
kw = dict((k, int(v)) for k, v in match.groupdict().iteritems())
return datetime.date(**kw)
-
def parse_time(value):
- """Parse a string and return a datetime.time.
+ """Parses a string and return a datetime.time.
This function doesn't support time zone offsets.
Sub-microsecond precision is accepted, but ignored.
- Raise ValueError if the input is well formatted but not a valid time.
- Return None if the input isn't well formatted, in particular if it
+ Raises ValueError if the input is well formatted but not a valid time.
+ Returns None if the input isn't well formatted, in particular if it
contains an offset.
"""
match = time_re.match(value)
@@ -63,17 +56,16 @@ def parse_time(value):
kw = dict((k, int(v)) for k, v in kw.iteritems() if v is not None)
return datetime.time(**kw)
-
def parse_datetime(value):
- """Parse a string and return a datetime.datetime.
+ """Parses a string and return a datetime.datetime.
This function supports time zone offsets. When the input contains one,
the output uses an instance of FixedOffset as tzinfo.
Sub-microsecond precision is accepted, but ignored.
- Raise ValueError if the input is well formatted but not a valid datetime.
- Return None if the input isn't well formatted.
+ Raises ValueError if the input is well formatted but not a valid datetime.
+ Returns None if the input isn't well formatted.
"""
match = datetime_re.match(value)
if match:
Please sign in to comment.
Something went wrong with that request. Please try again.