summaryrefslogtreecommitdiff
path: root/django/utils/simplejson
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2006-09-24 11:44:04 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2006-09-24 11:44:04 +0000
commitb05e5501a455a86e577e70617ca0f376041568c9 (patch)
treeaa92e631ca3fcec44fa753478ccfffbd89c214f1 /django/utils/simplejson
parent8f7ab8efed0edbca69e117c67e2b33a5fbd18fbe (diff)
Fixed #2677 -- Removed the need to import sre and hence avoid a
DeprecationWarning. Thanks, Tom Tobin. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/simplejson')
-rw-r--r--django/utils/simplejson/scanner.py3
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]