summaryrefslogtreecommitdiff
path: root/sphinx/pycode/pgen2/tokenize.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-01-10 20:35:16 +0100
committerGeorg Brandl <georg@python.org>2009-01-10 20:35:16 +0100
commitbeb141c1c79e5c7485f8ffef7eacf9212be3bcc3 (patch)
tree86f26d5b65c054047beab5800f2d87c8c7e8aa7f /sphinx/pycode/pgen2/tokenize.py
parent45c787144815aef27f5b41f629faaef120e0a589 (diff)
parent07c5a8b449ab2fe26eaeaa90717342dd6a947863 (diff)
downloadsphinx-git-beb141c1c79e5c7485f8ffef7eacf9212be3bcc3.tar.gz
merge in Ben's bundle with more py3k compatibility
Diffstat (limited to 'sphinx/pycode/pgen2/tokenize.py')
-rw-r--r--sphinx/pycode/pgen2/tokenize.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/pycode/pgen2/tokenize.py b/sphinx/pycode/pgen2/tokenize.py
index 84a9ddcfc..4489db898 100644
--- a/sphinx/pycode/pgen2/tokenize.py
+++ b/sphinx/pycode/pgen2/tokenize.py
@@ -284,7 +284,7 @@ def generate_tokens(readline):
if contstr: # continued string
if not line:
- raise TokenError, ("EOF in multi-line string", strstart)
+ raise TokenError("EOF in multi-line string", strstart)
endmatch = endprog.match(line)
if endmatch:
pos = end = endmatch.end(0)
@@ -340,7 +340,7 @@ def generate_tokens(readline):
else: # continued statement
if not line:
- raise TokenError, ("EOF in multi-line statement", (lnum, 0))
+ raise TokenError("EOF in multi-line statement", (lnum, 0))
continued = 0
while pos < max: