[Python-checkins] cpython (merge 3.5 -> default): Closes #25795: Merge with 3.5
zach.ware
python-checkins at python.org
Sat Dec 5 00:34:17 EST 2015
https://hg.python.org/cpython/rev/401459dca320
changeset: 99444:401459dca320
parent: 99442:f53958873fae
parent: 99443:a54ee6a65f10
user: Zachary Ware <zachary.ware at gmail.com>
date: Fri Dec 04 23:33:59 2015 -0600
summary:
Closes #25795: Merge with 3.5
files:
Lib/test/test_fork1.py | 1 +
Lib/test/test_list.py | 1 +
Lib/test/test_pyclbr.py | 4 ++--
Lib/test/test_telnetlib.py | 10 +++++-----
Lib/test/test_tuple.py | 1 +
Lib/test/test_userdict.py | 1 +
Lib/test/test_userlist.py | 1 +
Lib/test/test_wait4.py | 1 +
8 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Lib/test/test_fork1.py b/Lib/test/test_fork1.py
--- a/Lib/test/test_fork1.py
+++ b/Lib/test/test_fork1.py
@@ -6,6 +6,7 @@
import signal
import sys
import time
+import unittest
from test.fork_wait import ForkWait
from test.support import (reap_children, get_attribute,
diff --git a/Lib/test/test_list.py b/Lib/test/test_list.py
--- a/Lib/test/test_list.py
+++ b/Lib/test/test_list.py
@@ -1,6 +1,7 @@
import sys
from test import support, list_tests
import pickle
+import unittest
class ListTest(list_tests.CommonTest):
type2test = list
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -5,7 +5,7 @@
import sys
from types import FunctionType, MethodType, BuiltinFunctionType
import pyclbr
-from unittest import TestCase
+from unittest import TestCase, main as unittest_main
StaticMethodType = type(staticmethod(lambda: None))
ClassMethodType = type(classmethod(lambda c: None))
@@ -173,4 +173,4 @@
if __name__ == "__main__":
- unittest.main()
+ unittest_main()
diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py
--- a/Lib/test/test_telnetlib.py
+++ b/Lib/test/test_telnetlib.py
@@ -4,8 +4,8 @@
import time
import contextlib
-from unittest import TestCase
from test import support
+import unittest
threading = support.import_module('threading')
HOST = support.HOST
@@ -21,7 +21,7 @@
finally:
serv.close()
-class GeneralTests(TestCase):
+class GeneralTests(unittest.TestCase):
def setUp(self):
self.evt = threading.Event()
@@ -170,7 +170,7 @@
telnet._messages = '' # debuglevel output
return telnet
-class ExpectAndReadTestCase(TestCase):
+class ExpectAndReadTestCase(unittest.TestCase):
def setUp(self):
self.old_selector = telnetlib._TelnetSelector
telnetlib._TelnetSelector = MockSelector
@@ -289,7 +289,7 @@
tl = telnetlib
-class WriteTests(TestCase):
+class WriteTests(unittest.TestCase):
'''The only thing that write does is replace each tl.IAC for
tl.IAC+tl.IAC'''
@@ -305,7 +305,7 @@
written = b''.join(telnet.sock.writes)
self.assertEqual(data.replace(tl.IAC,tl.IAC+tl.IAC), written)
-class OptionTests(TestCase):
+class OptionTests(unittest.TestCase):
# RFC 854 commands
cmds = [tl.AO, tl.AYT, tl.BRK, tl.EC, tl.EL, tl.GA, tl.IP, tl.NOP]
diff --git a/Lib/test/test_tuple.py b/Lib/test/test_tuple.py
--- a/Lib/test/test_tuple.py
+++ b/Lib/test/test_tuple.py
@@ -1,4 +1,5 @@
from test import support, seq_tests
+import unittest
import gc
import pickle
diff --git a/Lib/test/test_userdict.py b/Lib/test/test_userdict.py
--- a/Lib/test/test_userdict.py
+++ b/Lib/test/test_userdict.py
@@ -1,6 +1,7 @@
# Check every path through every method of UserDict
from test import support, mapping_tests
+import unittest
import collections
d0 = {}
diff --git a/Lib/test/test_userlist.py b/Lib/test/test_userlist.py
--- a/Lib/test/test_userlist.py
+++ b/Lib/test/test_userlist.py
@@ -2,6 +2,7 @@
from collections import UserList
from test import support, list_tests
+import unittest
class UserListTest(list_tests.CommonTest):
type2test = UserList
diff --git a/Lib/test/test_wait4.py b/Lib/test/test_wait4.py
--- a/Lib/test/test_wait4.py
+++ b/Lib/test/test_wait4.py
@@ -4,6 +4,7 @@
import os
import time
import sys
+import unittest
from test.fork_wait import ForkWait
from test.support import reap_children, get_attribute
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list