summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2013-11-12 12:51:37 (GMT)
committerTim Golden <mail@timgolden.me.uk>2013-11-12 12:51:37 (GMT)
commitd9182e64cbfaa29205c09d33c8bddd5b0a8cc608 (patch)
tree46c6dd2790e649b68666718e82579424906cdf5b /Lib
parentbbe268f58334ec87940094f18dd2e13d1ef2ca70 (diff)
downloadcpython-d9182e64cbfaa29205c09d33c8bddd5b0a8cc608.zip
cpython-d9182e64cbfaa29205c09d33c8bddd5b0a8cc608.tar.gz
cpython-d9182e64cbfaa29205c09d33c8bddd5b0a8cc608.tar.bz2
Remove mis-merged artefact
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_strftime.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index d3f80c6..78604c6 100644
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -200,8 +200,5 @@ class Y1900Tests(unittest.TestCase):
self.assertEquals(
time.strftime("%y", (2013, 1, 1, 0, 0, 0, 0, 0, 0)), "13")
-def test_main():
- support.run_unittest(StrftimeTest, Y1900Tests)
-
if __name__ == '__main__':
unittest.main()