freeing random-order stackframes

Author: Jeff Quast

setup.py

@@ -15,7 +15,7 @@ def _get_long_description(fname, encoding='utf8'):
 
 setup(name='telnetlib3',
       # keep in sync w/docs/conf.py manually for now, please!
-      version='1.0.1',
+      version='1.0.2',
       url='http://telnetlib3.rtfd.org/',
       license='ISC',
       author='Jeff Quast',

telnetlib3/client.py

@@ -55,7 +55,6 @@ def __init__(self, term='unknown', cols=80, rows=25,
             'xdisploc': xdisploc,
         })
 
-
     def connection_made(self, transport):
         """Callback for connection made to server."""
         from telnetlib3.telopt import TTYPE, TSPEED, XDISPLOC, NEW_ENVIRON
@@ -90,9 +89,9 @@ def send_env(self, keys):
         """
         Callback for responding to NEW_ENVIRON requests.
 
-        :param dict keys: Values are requested for the keys specified. When empty,
-           all environment values that wish to be volunteered should be
-           returned.
+        :param dict keys: Values are requested for the keys specified.
+           When empty, all environment values that wish to be volunteered
+           should be returned.
         :returns: dictionary of environment values requested, or an
             empty string for keys not available. A return value must be
             given for each key requested.
@@ -127,16 +126,16 @@ def send_charset(self, offered):
         """
         selected = ''
         for offer in offered:
-                try:
-                    codec = codecs.lookup(offer)
-                except LookupError as err:
-                    self.log.info('LookupError: {}'.format(err))
-                else:
-                    if (codec.name == self.default_encoding or not selected):
-                        self._extra['charset'] = codec.name
-                        self._extra['lang'] = (
-                            self.DEFAULT_LOCALE + '.' + codec.name)
-                        selected = offer
+            try:
+                codec = codecs.lookup(offer)
+            except LookupError as err:
+                self.log.info('LookupError: {}'.format(err))
+            else:
+                if (codec.name == self.default_encoding or not selected):
+                    self._extra['charset'] = codec.name
+                    self._extra['lang'] = (
+                        self.DEFAULT_LOCALE + '.' + codec.name)
+                    selected = offer
         if selected:
             self.log.debug('encoding negotiated: {0}'.format(selected))
         else:

telnetlib3/tests/test_encoding.py

@@ -225,7 +225,7 @@ def binary_shell(reader, writer):
         # our reader and writer should provide binary output
         writer.write(b'server_output')
 
-        val = yield from reader.read(1)
+        val = yield from reader.readexactly(1)
         assert val == b'c'
         val = yield from reader.readexactly(len(b'lient '))
         assert val == b'lient '
@@ -242,7 +242,7 @@ def binary_shell(reader, writer):
         host=bind_host, port=unused_tcp_port, loop=event_loop)
 
     # exercise, server will binary
-    val = await reader.read(len(IAC + DO + TTYPE))
+    val = await reader.readexactly(len(IAC + DO + TTYPE))
     assert val == IAC + DO + TTYPE
 
     writer.write(IAC + WONT + TTYPE)
@@ -274,7 +274,7 @@ async def test_telnet_client_and_server_escape_iac_encoding(
     server = await asyncio.wait_for(_waiter, 0.5)
 
     server.writer.write(given_string)
-    result = await client_reader.read(len(given_string))
+    result = await client_reader.readexactly(len(given_string))
     assert result == given_string
     server.writer.close()
     eof = await asyncio.wait_for(client_reader.read(), 0.5)
@@ -300,7 +300,7 @@ async def test_telnet_client_and_server_escape_iac_binary(
     server = await asyncio.wait_for(_waiter, 0.5)
 
     server.writer.write(given_string)
-    result = await client_reader.read(len(given_string))
+    result = await client_reader.readexactly(len(given_string))
     assert result == given_string
     server.writer.close()
     eof = await asyncio.wait_for(client_reader.read(), 0.5)