mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 78982,78986 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78982 | florent.xicluna | 2010-03-15 15:00:58 +0100 (lun, 15 mar 2010) | 2 lines

  Remove py3k deprecation warnings from these Unicode tools.
........
  r78986 | florent.xicluna | 2010-03-15 19:08:58 +0100 (lun, 15 mar 2010) | 3 lines

  Issue #7783 and #7787: open_urlresource invalidates the outdated files from the local cache.
  Use this feature to fix test_normalization.
........
This commit is contained in:
Florent Xicluna 2010-03-19 14:25:03 +00:00
parent faa663f03d
commit f089fd67fc
5 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/test/test_normalization.py
View file

@ -9,14 +9,9 @@ from unicodedata import normalize, unidata_version
TESTDATAFILE = "NormalizationTest.txt"
TESTDATAURL = "http://www.unicode.org/Public/" + unidata_version + "/ucd/" + TESTDATAFILE
# Verify we have the correct version of the test data file.
TESTDATAPATH = os.path.join(os.path.dirname(__file__), "data", TESTDATAFILE)
if os.path.exists(TESTDATAPATH):
f = open(TESTDATAPATH, encoding='utf-8')
l = f.readline()
f.close()
if not unidata_version in l:
os.unlink(testdatafile)
def check_version(testfile):
hdr = testfile.readline()
return unidata_version in hdr
class RangeError(Exception):
pass
@ -42,13 +37,15 @@ def unistr(data):
class NormalizationTest(unittest.TestCase):
def test_main(self):
part = None
part1_data = {}
# Hit the exception early
try:
open_urlresource(TESTDATAURL, encoding="utf-8")
testdata = open_urlresource(TESTDATAURL, encoding="utf-8",
check=check_version)
except (IOError, HTTPException):
self.skipTest("Could not retrieve " + TESTDATAURL)
for line in open_urlresource(TESTDATAURL, encoding="utf-8"):
for line in testdata:
if '#' in line:
line = line.split('#')[0]
line = line.strip()