diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2007-01-30 22:34:15 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2007-01-30 22:34:15 +0000 |
| commit | 695302ce9214405e166ef559bdd8abb5fceaa020 (patch) | |
| tree | 8f42488e7d95244bab3db7b2bf934e006940521a /django/utils/simplejson/scanner.py | |
| parent | 1e3d035fcc1811b6b8028655784e19caaedc281f (diff) | |
Fixed #3320: upgraded django.utils.simplejson to simplejson version 1.5. Thanks, Lawrence Oluyede.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4454 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] |