summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-05-17 08:16:41 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-05-17 08:16:41 +0000
commitf6a26b3aa0cf4298b50d1837cdf931b52d21cbd5 (patch)
tree3663b48ad58c0393f504f7e9df893ad6d53f7f6f
parente35799a4de18a2682832910b959e92255aa5419d (diff)
downloaddocutils-f6a26b3aa0cf4298b50d1837cdf931b52d21cbd5.tar.gz
Error string change backborted to 2.7.4 and 3.2.4.
Thanks to Jakub Wilk for reporting. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7664 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rwxr-xr-xtest/test_parsers/test_rst/test_directives/test_tables.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_parsers/test_rst/test_directives/test_tables.py b/test/test_parsers/test_rst/test_directives/test_tables.py
index 24e520ce6..0d48048ff 100755
--- a/test/test_parsers/test_rst/test_directives/test_tables.py
+++ b/test/test_parsers/test_rst/test_directives/test_tables.py
@@ -34,7 +34,8 @@ else:
# some error messages changed in Python 3.3:
csv_eod_error_str = 'unexpected end of data'
-if sys.version_info < (3,3):
+if sys.version_info < (3,2,4) and not (# backport to 2.7.4
+ sys.version_info[:2] == (2,7) and sys.version_info[2] > 3):
csv_eod_error_str = 'newline inside string'
csv_unknown_url = "'bogus.csv'"
if sys.version_info < (3,3,2):