summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_eof.py
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2008-05-16 00:41:41 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2008-05-16 00:41:41 (GMT)
commit8ae3e055a51e4cddce90d0faad79ad27e21942c2 (patch)
tree3c721d3c584ae68f3df1ab1697718f73b9957fba /Lib/test/test_eof.py
parentd6bb7c2c405c72ca7cded5d0e5b873ed527b7f0b (diff)
downloadcpython-8ae3e055a51e4cddce90d0faad79ad27e21942c2.zip
cpython-8ae3e055a51e4cddce90d0faad79ad27e21942c2.tar.gz
cpython-8ae3e055a51e4cddce90d0faad79ad27e21942c2.tar.bz2
Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines #2709 followup: better description of Tk's pros and cons. ........ r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines #1326: document and test zipimporter.archive and zipimporter.prefix. ........ r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines #2816: clarify error messages for EOF while scanning strings. ........ r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines #2787: Flush stdout after writing test name, helpful when running hanging or long-running tests. Patch by Adam Olsen. ........ r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines #2803: fix wrong invocation of heappush in seldom-reached code. Thanks to Matt Harden. ........ r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines broaden .bzrignore ........ r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line Add message to test assertion ........ r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line Try setting HOME env.var to fix test on Win32 ........ r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines #2809 followup: even better split docstring. ........ r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines - #2250: Exceptions raised during evaluation of names in rlcompleter's ``Completer.complete()`` method are now caught and ignored. ........ r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines Clarify os.strerror()s exception behavior. ........ r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines #2535: remove duplicated method. ........ r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines Moved the Queue module stub in lib-old. ........
Diffstat (limited to 'Lib/test/test_eof.py')
-rw-r--r--Lib/test/test_eof.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_eof.py b/Lib/test/test_eof.py
index 4284d11..91fd845 100644
--- a/Lib/test/test_eof.py
+++ b/Lib/test/test_eof.py
@@ -6,7 +6,7 @@ from test import test_support
class EOFTestCase(unittest.TestCase):
def test_EOFC(self):
- expect = "EOL while scanning single-quoted string (<string>, line 1)"
+ expect = "EOL while scanning string literal (<string>, line 1)"
try:
eval("""'this is a test\
""")
@@ -16,7 +16,8 @@ class EOFTestCase(unittest.TestCase):
raise test_support.TestFailed
def test_EOFS(self):
- expect = "EOF while scanning triple-quoted string (<string>, line 1)"
+ expect = ("EOF while scanning triple-quoted string literal "
+ "(<string>, line 1)")
try:
eval("""'''this is a test""")
except SyntaxError as msg: