[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/4c7187448c62
changeset:   102025:4c7187448c62
parent:      102023:5e24a791303b
parent:      102024:38c1ccdfd38a
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Tue Jun 14 13:25:35 2016 +0300
summary:
  Merge from 3.5

files:
  Lib/sqlite3/test/dbapi.py |  12 ------------
  Lib/sqlite3/test/hooks.py |   6 ------
  2 files changed, 0 insertions(+), 18 deletions(-)


diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -695,12 +695,6 @@
         self.assertEqual(result, 5, "Basic test of Connection.executescript")
 
 class ClosedConTests(unittest.TestCase):
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
     def CheckClosedConCursor(self):
         con = sqlite.connect(":memory:")
         con.close()
@@ -768,12 +762,6 @@
             con()
 
 class ClosedCurTests(unittest.TestCase):
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
     def CheckClosed(self):
         con = sqlite.connect(":memory:")
         cur = con.cursor()
diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
--- a/Lib/sqlite3/test/hooks.py
+++ b/Lib/sqlite3/test/hooks.py
@@ -25,12 +25,6 @@
 import sqlite3 as sqlite
 
 class CollationTests(unittest.TestCase):
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
     def CheckCreateCollationNotCallable(self):
         con = sqlite.connect(":memory:")
         with self.assertRaises(TypeError) as cm:

-- 
Repository URL: https://hg.python.org/cpython