cpython: 7dac80e0dd5e (original) (raw)

Mercurial > cpython

changeset 101642:7dac80e0dd5e 2.7

Issue #27185: Merge test_pep292.py into test_string_merged.py. [#27185]

Serhiy Storchaka storchaka@gmail.com
date Fri, 03 Jun 2016 09:36:15 +0300
parents 27f5eb630499(current diff)8218b1309178(diff)
children e2e309fb2b1e
files Lib/test/test_pep292.py Lib/test/test_string_merged.py
diffstat 2 files changed, 227 insertions(+), 240 deletions(-)[+] [-] Lib/test/test_pep292.py 234 Lib/test/test_string_merged.py 233

line wrap: on

line diff

deleted file mode 100644 --- a/Lib/test/test_pep292.py +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright (C) 2004 Python Software Foundation -# Author: barry@python.org (Barry Warsaw) -# License: http://www.opensource.org/licenses/PythonSoftFoundation.php[](#l1.7) - -import unittest -from string import Template - - -class Bag:

- -class Mapping:

- - -class TestTemplate(unittest.TestCase):

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

- - -def test_main():

- - -if name == 'main':

--- a/Lib/test/test_string_merged.py +++ b/Lib/test/test_string_merged.py @@ -1,4 +1,6 @@ -import unittest, string +import unittest +import string +from string import Template from test import test_support, string_tests from UserList import UserList @@ -59,8 +61,6 @@ class StringTest( self.fail('exception not raised') - - class ModuleTest(unittest.TestCase): def test_attrs(self): @@ -219,8 +219,229 @@ class BytesAliasTest(unittest.TestCase): self.assertTrue(type(b""), str) self.assertTrue(type(br""), str) -def test_main():

+ +# Template tests (formerly housed in test_pep292.py) + +class Bag:

+ +class Mapping:

+ + +class TestTemplate(unittest.TestCase):

+

+

+

+

+

+

+

+

+

-if name == "main":

+

+

+

+

+

+

+

+

+

+

+

+ + +def test_main():

+ +if name == 'main': test_main()