[Python-checkins] r69876 - in python/branches/py3k: Lib/distutils/tests/test_text_file.py Lib/distutils/text_file.py
tarek.ziade
python-checkins at python.org
Sun Feb 22 21:05:23 CET 2009
Author: tarek.ziade
Date: Sun Feb 22 21:05:16 2009
New Revision: 69876
Log:
Merged revisions 69874 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69874 | tarek.ziade | 2009-02-22 20:58:12 +0100 (Sun, 22 Feb 2009) | 1 line
moved distutils.text_file tests into a real unittest class
........
Added:
python/branches/py3k/Lib/distutils/tests/test_text_file.py
- copied, changed from r69874, /python/trunk/Lib/distutils/tests/test_text_file.py
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/distutils/text_file.py
Copied: python/branches/py3k/Lib/distutils/tests/test_text_file.py (from r69874, /python/trunk/Lib/distutils/tests/test_text_file.py)
==============================================================================
--- /python/trunk/Lib/distutils/tests/test_text_file.py (original)
+++ python/branches/py3k/Lib/distutils/tests/test_text_file.py Sun Feb 22 21:05:16 2009
@@ -18,8 +18,9 @@
# so they are really called by the buildbots
# result 1: no fancy options
- result1 = map(lambda x: x + "\n",
- TEST_DATA.split("\n")[0:-1])
+ result1 = ['# test file\n', '\n', 'line 3 \\\n',
+ '# intervening comment\n',
+ ' continues on next line\n']
# result 2: just strip comments
result2 = ["\n",
Modified: python/branches/py3k/Lib/distutils/text_file.py
==============================================================================
--- python/branches/py3k/Lib/distutils/text_file.py (original)
+++ python/branches/py3k/Lib/distutils/text_file.py Sun Feb 22 21:05:16 2009
@@ -282,80 +282,3 @@
checked by future 'readline()' calls. Handy for implementing
a parser with line-at-a-time lookahead."""
self.linebuf.append(line)
-
-
-if __name__ == "__main__":
- test_data = """# test file
-
-line 3 \\
-# intervening comment
- continues on next line
-"""
- # result 1: no fancy options
- result1 = [x + "\n" for x in test_data.split("\n")[:-1]]
-
- # result 2: just strip comments
- result2 = ["\n",
- "line 3 \\\n",
- " continues on next line\n"]
-
- # result 3: just strip blank lines
- result3 = ["# test file\n",
- "line 3 \\\n",
- "# intervening comment\n",
- " continues on next line\n"]
-
- # result 4: default, strip comments, blank lines, and trailing whitespace
- result4 = ["line 3 \\",
- " continues on next line"]
-
- # result 5: strip comments and blanks, plus join lines (but don't
- # "collapse" joined lines
- result5 = ["line 3 continues on next line"]
-
- # result 6: strip comments and blanks, plus join lines (and
- # "collapse" joined lines
- result6 = ["line 3 continues on next line"]
-
- def test_input(count, description, file, expected_result):
- result = file.readlines()
- if result == expected_result:
- print("ok %d (%s)" % (count, description))
- else:
- print("not ok %d (%s):" % (count, description))
- print("** expected:")
- print(expected_result)
- print("** received:")
- print(result)
-
-
- filename = "test.txt"
- out_file = open(filename, "w")
- out_file.write(test_data)
- out_file.close()
-
- in_file = TextFile(filename, strip_comments=0, skip_blanks=0,
- lstrip_ws=0, rstrip_ws=0)
- test_input(1, "no processing", in_file, result1)
-
- in_file = TextFile(filename, strip_comments=1, skip_blanks=0,
- lstrip_ws=0, rstrip_ws=0)
- test_input(2, "strip comments", in_file, result2)
-
- in_file = TextFile(filename, strip_comments=0, skip_blanks=1,
- lstrip_ws=0, rstrip_ws=0)
- test_input(3, "strip blanks", in_file, result3)
-
- in_file = TextFile(filename)
- test_input(4, "default processing", in_file, result4)
-
- in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
- join_lines=1, rstrip_ws=1)
- test_input(5, "join lines without collapsing", in_file, result5)
-
- in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
- join_lines=1, rstrip_ws=1, collapse_join=1)
- test_input(6, "join lines with collapsing", in_file, result6)
-
- del in_file
- os.remove(filename)
More information about the Python-checkins
mailing list