pulse2: Fix failing test

Signed-off-by: Manatsawin Hanmongkolchai <git@whs.in.th>

python_libs/pulse2/pebble/pulse2/__init__.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
-
 from . import link, transports
 
 # Public aliases for the classes that users will interact with directly.

python_libs/pulse2/pebble/pulse2/ppp.py

@@ -818,7 +818,7 @@ class ControlProtocol(object):
                 ControlCode(rejected_packet.code)
                 # Known code; not supporting any of these is catastrophic.
                 self.logger.error(
-                        'Remote peer rejected a packet with code %s; ',
+                        'Remote peer rejected a packet with code %s; '
                         'the connection cannot proceed without this code '
                         'being supported', rejected_packet.code)
                 self.receive_code_reject_catastrophic()

python_libs/pulse2/tests/test_link.py

@@ -109,7 +109,7 @@ class TestInterface(unittest.TestCase):
 
     def test_opening_two_sockets_on_same_protocol_is_an_error(self):
         socket1 = self.uut.connect(0xf0f1)
-        with self.assertRaisesRegexp(ValueError, 'socket is already bound'):
+        with self.assertRaisesRegex(ValueError, 'socket is already bound'):
             socket2 = self.uut.connect(0xf0f1)
 
     def test_closing_socket_allows_another_to_be_opened(self):
@@ -120,7 +120,7 @@ class TestInterface(unittest.TestCase):
 
     def test_sending_from_closed_interface_is_an_error(self):
         self.uut.close()
-        with self.assertRaisesRegexp(ValueError, 'closed interface'):
+        with self.assertRaisesRegex(ValueError, 'closed interface'):
             self.uut.send_packet(0x8889, b'data')
 
     def test_get_link_returns_None_when_lcp_is_down(self):
@@ -128,7 +128,7 @@ class TestInterface(unittest.TestCase):
 
     def test_get_link_from_closed_interface_is_an_error(self):
         self.uut.close()
-        with self.assertRaisesRegexp(ValueError, 'closed interface'):
+        with self.assertRaisesRegex(ValueError, 'closed interface'):
             self.uut.get_link(timeout=0)
 
     def test_get_link_when_lcp_is_up(self):
@@ -253,9 +253,9 @@ class TestLink(unittest.TestCase):
 
     def test_open_socket_after_down_is_an_error(self):
         self.uut.down()
-        with self.assertRaisesRegexp(ValueError, 'closed Link'):
+        with self.assertRaisesRegex(ValueError, 'closed Link'):
             self.uut.open_socket('fake', 0xabcd)
 
     def test_open_socket_with_bad_transport_name(self):
-        with self.assertRaisesRegexp(KeyError, "Unknown transport 'bad'"):
+        with self.assertRaisesRegex(KeyError, "Unknown transport 'bad'"):
             self.uut.open_socket('bad', 0xabcd)

python_libs/pulse2/tests/test_ppp.py

@@ -352,7 +352,7 @@ class TestControlProtocolFSM(ControlProtocolTestMixin, unittest.TestCase):
 
     def test_code_reject_truncates_rejected_packet(self):
         self.test_trivial_handshake()
-        self.incoming_packet(0xaa, 0x20, 'a'*1496)  # 1500-byte Info
+        self.incoming_packet(0xaa, 0x20, b'a'*1496)  # 1500-byte Info
         self.assert_packet_sent('Code_Reject', 0,
                                 b'\xaa\x20\x05\xdc' + b'a'*1492)
 

python_libs/pulse2/tests/test_transports.py

@@ -161,7 +161,7 @@ class TestBestEffortTransport(CommonTransportTestCases, unittest.TestCase):
         self.uut.send(0xaaaa, b'a'*1496)
 
     def test_send_greater_than_mtu(self):
-        with self.assertRaisesRegexp(ValueError, 'Packet length'):
+        with self.assertRaisesRegex(ValueError, 'Packet length'):
             self.uut.send(0xaaaa, b'a'*1497)
 
     def test_transport_down_closes_link_socket_and_ncp(self):
@@ -350,7 +350,7 @@ class TestReliableTransport(CommonTransportTestCases,
 
     def test_send_with_no_response(self):
         self.uut.send(0xd00d, b'blarg')
-        for _ in xrange(self.uut.max_retransmits):
+        for _ in range(self.uut.max_retransmits):
             FakeTimer.get_active_timers()[-1].expire()
         self.uut.ncp.restart.assert_called_once_with()
 
@@ -401,7 +401,7 @@ class TestReliableTransport(CommonTransportTestCases,
         self.uut.send(0xaaaa, b'a'*1494)
 
     def test_send_greater_than_mtu(self):
-        with self.assertRaisesRegexp(ValueError, 'Packet length'):
+        with self.assertRaisesRegex(ValueError, 'Packet length'):
             self.uut.send(0xaaaa, b'a'*1496)
 
     def test_send_from_socket(self):