diff options
| author | Robin Munn <robin.munn@gmail.com> | 2006-09-25 15:39:20 +0000 |
|---|---|---|
| committer | Robin Munn <robin.munn@gmail.com> | 2006-09-25 15:39:20 +0000 |
| commit | 1bb4fa2cb66269b1eff3b7d73f8c7864c0622368 (patch) | |
| tree | 99ebf72b9983e35e50e65d0d421949a2740bf105 /django/utils/simplejson | |
| parent | 8afc419b123f315d724cbefdbc4c07f0982627a9 (diff) | |
sqlalchemy: Merged revisions 3770 to 3831 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/sqlalchemy@3832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/simplejson')
| -rw-r--r-- | django/utils/simplejson/scanner.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/django/utils/simplejson/scanner.py b/django/utils/simplejson/scanner.py index c2e9b6eb89..b9244cfed1 100644 --- a/django/utils/simplejson/scanner.py +++ b/django/utils/simplejson/scanner.py @@ -3,12 +3,11 @@ Iterator based sre token scanner """ import sre_parse, sre_compile, sre_constants from sre_constants import BRANCH, SUBPATTERN -from sre import VERBOSE, MULTILINE, DOTALL import re __all__ = ['Scanner', 'pattern'] -FLAGS = (VERBOSE | MULTILINE | DOTALL) +FLAGS = (re.VERBOSE | re.MULTILINE | re.DOTALL) class Scanner(object): def __init__(self, lexicon, flags=FLAGS): self.actions = [None] |