diff options
| author | Derek Anderson <public@kered.org> | 2007-07-20 20:49:49 +0000 |
|---|---|---|
| committer | Derek Anderson <public@kered.org> | 2007-07-20 20:49:49 +0000 |
| commit | 365f4b869800469ba786919f11422c73b3ec9fbb (patch) | |
| tree | bc45d8db548a35b99c54600e0c4fde9ca87b35bc /django/utils/simplejson/scanner.py | |
| parent | 42851d90dadbf62f5d342ce5c4f496ba1eeba987 (diff) | |
schema-evolution: merged trunk:HEAD into schema-evolution branch
git-svn-id: http://code.djangoproject.com/svn/django/branches/schema-evolution@5734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/simplejson/scanner.py')
| -rw-r--r-- | django/utils/simplejson/scanner.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/utils/simplejson/scanner.py b/django/utils/simplejson/scanner.py index b9244cfed1..64f4999fb5 100644 --- a/django/utils/simplejson/scanner.py +++ b/django/utils/simplejson/scanner.py @@ -3,11 +3,12 @@ Iterator based sre token scanner """ import sre_parse, sre_compile, sre_constants from sre_constants import BRANCH, SUBPATTERN +from re import VERBOSE, MULTILINE, DOTALL import re __all__ = ['Scanner', 'pattern'] -FLAGS = (re.VERBOSE | re.MULTILINE | re.DOTALL) +FLAGS = (VERBOSE | MULTILINE | DOTALL) class Scanner(object): def __init__(self, lexicon, flags=FLAGS): self.actions = [None] |