Issue #12158: Move linux_version() from test_socket to test.support

diff --git a/Lib/test/support.py b/Lib/test/support.py
index 3f60d5597dcf9194d46f8366a715e48e3afca148..b03069c40edbfa988ff11e3d8b0a54477565ad95 100644 (file)
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -291,6 +291,14 @@ def requires(resource, msg=None):
             msg = "Use of the `%s' resource not enabled" % resource
         raise ResourceDenied(msg)
 
+def linux_version():
+    try:
+        # platform.release() is something like '2.6.33.7-desktop-2mnb'
+        version_string = platform.release().split('-')[0]
+        return tuple(map(int, version_string.split('.')))
+    except ValueError:
+        return 0, 0, 0
+
 HOST = 'localhost'
 
 def find_unused_port(family=socket.AF_INET, socktype=socket.SOCK_STREAM):

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index a449f5bdcc410ba10a34b5c38513e70e7c6b7231..59e3019f5eb9a52fab94816721be207f4694ba0a 100644 (file)
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -24,14 +24,6 @@ try:
 except ImportError:
     fcntl = False
 
-def linux_version():
-    try:
-        # platform.release() is something like '2.6.33.7-desktop-2mnb'
-        version_string = platform.release().split('-')[0]
-        return tuple(map(int, version_string.split('.')))
-    except ValueError:
-        return 0, 0, 0
-
 HOST = support.HOST
 MSG = 'Michael Gilfix was here\u1234\r\n'.encode('utf-8') ## test unicode string and carriage return
 
@@ -1032,7 +1024,7 @@ class NonBlockingTCPTests(ThreadedTCPSocketTest):
 
     if hasattr(socket, "SOCK_NONBLOCK"):
         def testInitNonBlocking(self):
-            v = linux_version()
+            v = support.linux_version()
             if v < (2, 6, 28):
                 self.skipTest("Linux kernel 2.6.28 or higher required, not %s"
                               % ".".join(map(str, v)))
@@ -2010,7 +2002,7 @@ class ContextManagersTest(ThreadedTCPSocketTest):
 @unittest.skipUnless(fcntl, "module fcntl not available")
 class CloexecConstantTest(unittest.TestCase):
     def test_SOCK_CLOEXEC(self):
-        v = linux_version()
+        v = support.linux_version()
         if v < (2, 6, 28):
             self.skipTest("Linux kernel 2.6.28 or higher required, not %s"
                           % ".".join(map(str, v)))
@@ -2032,7 +2024,7 @@ class NonblockConstantTest(unittest.TestCase):
             self.assertEqual(s.gettimeout(), None)
 
     def test_SOCK_NONBLOCK(self):
-        v = linux_version()
+        v = support.linux_version()
         if v < (2, 6, 28):
             self.skipTest("Linux kernel 2.6.28 or higher required, not %s"
                           % ".".join(map(str, v)))