wip

1 files changed, 20 insertions, 32 deletions

diff --git a/OpenSSL/test/test_ssl.py b/OpenSSL/test/test_ssl.py
index b4c42af..f35a36e 100644
--- a/OpenSSL/test/test_ssl.py
+++ b/OpenSSL/test/test_ssl.py
@@ -3003,17 +3003,15 @@ class ConnectionSendallTests(TestCase, _LoopbackMixin):
         self.assertRaises(
             TypeError, connection.sendall, "foo", object(), "bar")
 
-
     def test_short(self):
         """
-        :py:obj:`Connection.sendall` transmits all of the bytes in the string passed to
-        it.
+        :py:obj:`Connection.sendall` transmits all of the bytes in the string
+        passed to it.
         """
         server, client = self._loopback()
         server.sendall(b('x'))
         self.assertEquals(client.recv(1), b('x'))
 
-
     def test_text(self):
         """
         :py:obj:`Connection.sendall` transmits all the content in the string
@@ -3032,35 +3030,25 @@ class ConnectionSendallTests(TestCase, _LoopbackMixin):
             self.assertIs(w[-1].category, DeprecationWarning)
         self.assertEquals(client.recv(1), b"x")
 
+    @skip_if_py26
+    def test_short_memoryview(self):
+        """
+        When passed a memoryview onto a small number of bytes,
+        :py:obj:`Connection.sendall` transmits all of them.
+        """
+        server, client = self._loopback()
+        server.sendall(memoryview(b('x')))
+        self.assertEquals(client.recv(1), b('x'))
 
-    try:
-        memoryview
-    except NameError:
-        "cannot test sending memoryview without memoryview"
-    else:
-        def test_short_memoryview(self):
-            """
-            When passed a memoryview onto a small number of bytes,
-            :py:obj:`Connection.sendall` transmits all of them.
-            """
-            server, client = self._loopback()
-            server.sendall(memoryview(b('x')))
-            self.assertEquals(client.recv(1), b('x'))
-
-
-    try:
-        buffer
-    except NameError:
-        "cannot test sending buffers without buffers"
-    else:
-        def test_short_buffers(self):
-            """
-            When passed a buffer containing a small number of bytes,
-            :py:obj:`Connection.sendall` transmits all of them.
-            """
-            server, client = self._loopback()
-            server.sendall(buffer(b('x')))
-            self.assertEquals(client.recv(1), b('x'))
+    @skip_if_py3
+    def test_short_buffers(self):
+        """
+        When passed a buffer containing a small number of bytes,
+        :py:obj:`Connection.sendall` transmits all of them.
+        """
+        server, client = self._loopback()
+        server.sendall(buffer(b('x')))
+        self.assertEquals(client.recv(1), b('x'))
 
 
     def test_long(self):