January 2020 - tor-commits - lists.torproject.org

[stem/master] Drop importlib fallback
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit bcdfbd993ab9008ae6d36be41989fdf3d387cc3f Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 3 16:30:24 2020 -0800 Drop importlib fallback --- test/task.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/test/task.py b/test/task.py index 70ab5e4b..19026165 100644 --- a/test/task.py +++ b/test/task.py @@ -24,6 +24,7 @@ +- PYCODESTYLE_TASK - style checks """ +import importlib import os import platform import re @@ -45,14 +46,6 @@ from test.output import STATUS, ERROR, NO_NL, println TASK_DESCRIPTION_WIDTH = 40 -try: - # TODO: remove check when dropping python 2.6 support - - import importlib - HAS_IMPORTLIB = True -except ImportError: - HAS_IMPORTLIB = False - CONFIG = stem.util.conf.config_dict('test', { 'integ.test_directory': './test/data', 'test.unit_tests': '', @@ -162,9 +155,6 @@ def _import_tests(): register if they're asynchronous. """ - if not HAS_IMPORTLIB: - return - for module in (CONFIG['test.unit_tests'].splitlines() + CONFIG['test.integ_tests'].splitlines()): try: importlib.import_module(module.rsplit('.', 1)[0]) @@ -304,7 +294,7 @@ class ModuleVersion(Task): def version_check(): if prereq_check is None or prereq_check(): for module in modules: - if HAS_IMPORTLIB and stem.util.test_tools._module_exists(module): + if stem.util.test_tools._module_exists(module): return importlib.import_module(module).__version__ return 'missing'

1 0

[stem/master] Use file's seekable() method
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit 8406d91ebf979503f84764aacd05d62d93cea470 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 17:21:15 2020 -0800 Use file's seekable() method Another small python 3.x simplification. --- stem/descriptor/__init__.py | 9 +-------- stem/descriptor/export.py | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index b7270ac2..fff08910 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -371,14 +371,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = False, docume return - # Not all files are seekable. If unseekable then advising the user. - # - # Python 3.x adds an io.seekable() method, but not an option with python 2.x - # so using an experimental call to tell() to determine this. - - try: - descriptor_file.tell() - except IOError: + if not descriptor_file.seekable(): raise IOError(UNSEEKABLE_MSG) # The tor descriptor specifications do not provide a reliable method for diff --git a/stem/descriptor/export.py b/stem/descriptor/export.py index 4b909c97..35835d7c 100644 --- a/stem/descriptor/export.py +++ b/stem/descriptor/export.py @@ -40,7 +40,7 @@ def export_csv(descriptors, included_fields = (), excluded_fields = (), header = :param list included_fields: attributes to include in the csv :param list excluded_fields: attributes to exclude from the csv :param bool header: if **True** then the first line will be a comma separated - list of the attribute names (**only supported in python 2.7 and higher**) + list of the attribute names :returns: **str** of the CSV for the descriptors, one per line :raises: **ValueError** if descriptors contain more than one descriptor type @@ -62,7 +62,7 @@ def export_csv_file(output_file, descriptors, included_fields = (), excluded_fie :param list included_fields: attributes to include in the csv :param list excluded_fields: attributes to exclude from the csv :param bool header: if **True** then the first line will be a comma separated - list of the attribute names (**only supported in python 2.7 and higher**) + list of the attribute names :returns: **str** of the CSV for the descriptors, one per line :raises: **ValueError** if descriptors contain more than one descriptor type

1 0

[stem/master] Open tarfile using 'with' statement
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit 45463c5a083965799b3500ed2715a43baf89b3aa Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 15:21:59 2020 -0800 Open tarfile using 'with' statement Addressing one of our TODO comments. This one's kinda moot since we're dropping this whole module but... meh. --- stem/descriptor/__init__.py | 8 +---- stem/descriptor/reader.py | 56 +++++++++++++------------------ test/integ/installation.py | 4 +-- test/unit/descriptor/reader.py | 12 +------ test/unit/descriptor/server_descriptor.py | 14 +++----- 5 files changed, 32 insertions(+), 62 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index ec299289..b7270ac2 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -447,16 +447,10 @@ def _parse_file_for_path(descriptor_file, *args, **kwargs): def _parse_file_for_tar_path(descriptor_file, *args, **kwargs): - # TODO: use 'with' for tarfile after dropping python 2.6 support - tar_file = tarfile.open(descriptor_file) - - try: + with tarfile.open(descriptor_file) as tar_file: for desc in parse_file(tar_file, *args, **kwargs): desc._set_path(os.path.abspath(descriptor_file)) yield desc - finally: - if tar_file: - tar_file.close() def _parse_file_for_tarfile(descriptor_file, *args, **kwargs): diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 8ef6f22c..e75cdb7e 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -255,7 +255,7 @@ class DescriptorReader(object): :param bool validate: checks the validity of the descriptor's content if **True**, skips these checks otherwise :param bool follow_links: determines if we'll follow symlinks when traversing - directories (requires python 2.6) + directories :param int buffer_size: descriptors we'll buffer before waiting for some to be read, this is unbounded if zero :param str persistence_path: if set we will load and save processed file @@ -521,41 +521,31 @@ class DescriptorReader(object): self._notify_skip_listeners(target, ReadFailed(exc)) def _handle_archive(self, target): - # TODO: When dropping python 2.6 support go back to using 'with' for - # tarfiles... - # - # http://bugs.python.org/issue7232 - - tar_file = None - try: - self._notify_read_listeners(target) - tar_file = tarfile.open(target) - - for tar_entry in tar_file: - if tar_entry.isfile(): - entry = tar_file.extractfile(tar_entry) - - try: - for desc in stem.descriptor.parse_file(entry, validate = self._validate, document_handler = self._document_handler, **self._kwargs): - if self._is_stopped.is_set(): - return - - desc._set_path(os.path.abspath(target)) - desc._set_archive_path(tar_entry.name) - self._unreturned_descriptors.put(desc) - self._iter_notice.set() - except TypeError as exc: - self._notify_skip_listeners(target, ParsingFailure(exc)) - except ValueError as exc: - self._notify_skip_listeners(target, ParsingFailure(exc)) - finally: - entry.close() + with tarfile.open(target) as tar_file: + self._notify_read_listeners(target) + + for tar_entry in tar_file: + if tar_entry.isfile(): + entry = tar_file.extractfile(tar_entry) + + try: + for desc in stem.descriptor.parse_file(entry, validate = self._validate, document_handler = self._document_handler, **self._kwargs): + if self._is_stopped.is_set(): + return + + desc._set_path(os.path.abspath(target)) + desc._set_archive_path(tar_entry.name) + self._unreturned_descriptors.put(desc) + self._iter_notice.set() + except TypeError as exc: + self._notify_skip_listeners(target, ParsingFailure(exc)) + except ValueError as exc: + self._notify_skip_listeners(target, ParsingFailure(exc)) + finally: + entry.close() except IOError as exc: self._notify_skip_listeners(target, ReadFailed(exc)) - finally: - if tar_file: - tar_file.close() def _notify_read_listeners(self, path): for listener in self._read_listeners: diff --git a/test/integ/installation.py b/test/integ/installation.py index 627f0314..2f41ef58 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -127,8 +127,8 @@ class TestInstallation(unittest.TestCase): # tarball has a prefix 'stem-[verion]' directory so stipping that out - dist_tar = tarfile.open(os.path.join(DIST_PATH, 'stem-dry-run-%s.tar.gz' % stem.__version__)) - tar_contents = ['/'.join(info.name.split('/')[1:]) for info in dist_tar.getmembers() if info.isfile()] + with tarfile.open(os.path.join(DIST_PATH, 'stem-dry-run-%s.tar.gz' % stem.__version__)) as dist_tar: + tar_contents = ['/'.join(info.name.split('/')[1:]) for info in dist_tar.getmembers() if info.isfile()] issues = [] diff --git a/test/unit/descriptor/reader.py b/test/unit/descriptor/reader.py index 39a5d669..f49183e5 100644 --- a/test/unit/descriptor/reader.py +++ b/test/unit/descriptor/reader.py @@ -40,23 +40,13 @@ def _get_raw_tar_descriptors(): test_path = os.path.join(DESCRIPTOR_TEST_DATA, 'descriptor_archive.tar') raw_descriptors = [] - # TODO: revert to using the 'with' keyword for this when dropping python - # 2.6 support - - tar_file = None - - try: - tar_file = tarfile.open(test_path) - + with tarfile.open(test_path) as tar_file: for tar_entry in tar_file: if tar_entry.isfile(): entry = tar_file.extractfile(tar_entry) entry.readline() # strip header raw_descriptors.append(entry.read().decode('utf-8', 'replace')) entry.close() - finally: - if tar_file: - tar_file.close() TAR_DESCRIPTORS = raw_descriptors diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 2f448404..aeb58df1 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -65,16 +65,12 @@ class TestServerDescriptor(unittest.TestCase): Fetch server descriptors via parse_file() for a tarfile object. """ - # TODO: When dropping python 2.6 support we can go back to using the 'with' - # keyword here. + with tarfile.open(get_resource('descriptor_archive.tar')) as tar_file: + descriptors = list(stem.descriptor.parse_file(tar_file)) + self.assertEqual(3, len(descriptors)) - tar_file = tarfile.open(get_resource('descriptor_archive.tar')) - descriptors = list(stem.descriptor.parse_file(tar_file)) - self.assertEqual(3, len(descriptors)) - - fingerprints = set([desc.fingerprint for desc in descriptors]) - self.assertEqual(TARFILE_FINGERPRINTS, fingerprints) - tar_file.close() + fingerprints = set([desc.fingerprint for desc in descriptors]) + self.assertEqual(TARFILE_FINGERPRINTS, fingerprints) def test_metrics_descriptor(self): """

1 0

[stem/master] Drop struct usage from Size class
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit 3b46d49e499b9a15c1657bb643d0fcb7bd505faa Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 17:44:48 2020 -0800 Drop struct usage from Size class Python 3.x added better methods for integer conversion to/from bytes. --- stem/client/datatype.py | 38 +++++++++++--------------------------- test/unit/client/size.py | 6 ++---- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/stem/client/datatype.py b/stem/client/datatype.py index 0b39d1b5..1db46a28 100644 --- a/stem/client/datatype.py +++ b/stem/client/datatype.py @@ -138,7 +138,6 @@ users.** See our :class:`~stem.client.Relay` the API you probably want. import binascii import collections import hashlib -import struct import stem.client.cell import stem.prereq @@ -367,7 +366,7 @@ class Field(object): class Size(Field): """ Unsigned `struct.pack format - <https://docs.python.org/2/library/struct.html#format-characters>` for + <https://docs.python.org/3/library/struct.html#format-characters>` for network-order fields. ==================== =========== @@ -380,45 +379,30 @@ class Size(Field): ==================== =========== """ - def __init__(self, name, size, pack_format): + def __init__(self, name, size): self.name = name self.size = size - self.format = pack_format @staticmethod def pop(packed): raise NotImplementedError("Use our constant's unpack() and pop() instead") def pack(self, content): - # TODO: When we drop python 2.x support this can be simplified via - # integer's to_bytes() method. For example... - # - # struct.pack('>Q', my_number) - # - # ... is the same as... - # - # my_number.to_bytes(8, 'big') - try: - packed = struct.pack(self.format, content) - except struct.error: + return content.to_bytes(self.size, 'big') + except: if not isinstance(content, int): raise ValueError('Size.pack encodes an integer, but was a %s' % type(content).__name__) elif content < 0: raise ValueError('Packed values must be positive (attempted to pack %i as a %s)' % (content, self.name)) else: - raise # some other struct exception - - if self.size != len(packed): - raise ValueError('%s is the wrong size for a %s field' % (repr(packed), self.name)) - - return packed + raise def unpack(self, packed): if self.size != len(packed): raise ValueError('%s is the wrong size for a %s field' % (repr(packed), self.name)) - return struct.unpack(self.format, packed)[0] + return int.from_bytes(packed, 'big') def pop(self, packed): to_unpack, remainder = split(packed, self.size) @@ -426,7 +410,7 @@ class Size(Field): return self.unpack(to_unpack), remainder def __hash__(self): - return stem.util._hash_attr(self, 'name', 'size', 'format', cache = True) + return stem.util._hash_attr(self, 'name', 'size', cache = True) class Address(Field): @@ -722,7 +706,7 @@ def _unpack_ipv6_address(value): return ':'.join(['%04x' % Size.SHORT.unpack(value[i * 2:(i + 1) * 2]) for i in range(8)]) -setattr(Size, 'CHAR', Size('CHAR', 1, '!B')) -setattr(Size, 'SHORT', Size('SHORT', 2, '!H')) -setattr(Size, 'LONG', Size('LONG', 4, '!L')) -setattr(Size, 'LONG_LONG', Size('LONG_LONG', 8, '!Q')) +setattr(Size, 'CHAR', Size('CHAR', 1)) +setattr(Size, 'SHORT', Size('SHORT', 2)) +setattr(Size, 'LONG', Size('LONG', 4)) +setattr(Size, 'LONG_LONG', Size('LONG_LONG', 8)) diff --git a/test/unit/client/size.py b/test/unit/client/size.py index dcd5fea3..d3bb4a4a 100644 --- a/test/unit/client/size.py +++ b/test/unit/client/size.py @@ -11,8 +11,6 @@ from stem.client.datatype import Size class TestSize(unittest.TestCase): def test_attributes(self): self.assertEqual('CHAR', Size.CHAR.name) - self.assertEqual('!B', Size.CHAR.format) - self.assertEqual(1, Size.CHAR.size) self.assertEqual(2, Size.SHORT.size) self.assertEqual(4, Size.LONG.size) @@ -27,8 +25,8 @@ class TestSize(unittest.TestCase): self.assertRaisesWith(ValueError, 'Size.pack encodes an integer, but was a str', Size.CHAR.pack, 'hi') self.assertRaisesWith(ValueError, 'Packed values must be positive (attempted to pack -1 as a CHAR)', Size.CHAR.pack, -1) - bad_size = Size('BAD_SIZE', 1, '!H') - self.assertRaisesRegexp(ValueError, re.escape("'\\x00\\x12' is the wrong size for a BAD_SIZE field"), bad_size.pack, 18) + too_small = Size('TOO_SMALL', 1) + self.assertRaises(OverflowError, too_small.pack, 1800) def test_unpack(self): self.assertEqual(18, Size.CHAR.unpack(b'\x12'))

1 0

[stem/master] Disconnected sockets raise OSErrors
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit 7e1234c39f6a2e9f894d3c8e24a46e2921961acb Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 12:40:56 2020 -0800 Disconnected sockets raise OSErrors Dropping exception normalization has caused our tests to fail with... ====================================================================== ERROR: test_disconnected_socket ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/response/control_message.py", line 169, in test_disconnected_socket self.assertRaises(stem.SocketClosed, stem.socket.recv_message, control_socket_file) File "/home/atagar/Python-3.7.0/Lib/unittest/case.py", line 743, in assertRaises return context.handle('assertRaises', args, kwargs) File "/home/atagar/Python-3.7.0/Lib/unittest/case.py", line 178, in handle callable_obj(*args, **kwargs) File "/home/atagar/Desktop/stem/stem/socket.py", line 665, in recv_message line = control_file.readline() File "/home/atagar/Python-3.7.0/Lib/socket.py", line 589, in readinto return self._sock.recv_into(b) OSError: [Errno 107] Transport endpoint is not connected Rather than catching socket.error as we used to narrowing this to OSErrors. If other socket error subclasses come up in practice we'll go back to the parent class. --- stem/socket.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index a62bb6b3..4ab534b8 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -669,8 +669,12 @@ def recv_message(control_file, arrived_at = None): log.info(ERROR_MSG % ('SocketClosed', 'socket file has been closed')) raise stem.SocketClosed('socket file has been closed') - except ValueError as exc: - # when disconnected this errors with 'I/O operation on closed file' + except (OSError, ValueError) as exc: + # when disconnected this errors with... + # + # * ValueError: I/O operation on closed file + # * OSError: [Errno 107] Transport endpoint is not connected + # * OSError: [Errno 9] Bad file descriptor log.info(ERROR_MSG % ('SocketClosed', 'received exception "%s"' % exc)) raise stem.SocketClosed(exc)

1 0

[stem/master] Don't suppress socket closing exceptions
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit e91d0ef934a700699403fd3172ee98f0a7915193 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 12:15:17 2020 -0800 Don't suppress socket closing exceptions We'll revert this if it becomes an issue in practice, but the comment says that we suppress exceptions due to python 2.x. I tried closing a socket multiple times with python 3.x and it did not raise an exception, so for the moment we don't have a known reason to expect these calls to error. --- stem/socket.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index 275a55d4..4105152f 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -204,21 +204,10 @@ class BaseSocket(object): except socket.error: pass - # Suppressing unexpected exceptions from close. For instance, if the - # socket's file has already been closed then with python 2.7 that raises - # with... - # error: [Errno 32] Broken pipe - - try: - self._socket.close() - except: - pass + self._socket.close() if self._socket_file: - try: - self._socket_file.close() - except: - pass + self._socket_file.close() self._socket = None self._socket_file = None

1 0

[stem/master] Replace print function with lambda
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit ef177c52569d1fbcce8f3203d111c2b74fe5e0db Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 12:36:59 2020 -0800 Replace print function with lambda --- stem/interpreter/__init__.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index fc0c2cf3..67984261 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -127,14 +127,7 @@ def main(): if args.run_cmd: if args.run_cmd.upper().startswith('SETEVENTS '): - # TODO: we can use a lambda here when dropping python 2.x support, but - # until then print's status as a keyword prevents it from being used in - # lambdas - - def handle_event(event_message): - print(format(str(event_message), *STANDARD_OUTPUT)) - - controller._handle_event = handle_event + controller._handle_event = lambda event_message: print(format(str(event_message), *STANDARD_OUTPUT)) if sys.stdout.isatty(): events = args.run_cmd.upper().split(' ', 1)[1]

1 0

[stem/master] Drop python 2.x exception normalization
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit 7d4b94de2ca18e6793adb3c931b63471ff6df1ef Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 12:18:52 2020 -0800 Drop python 2.x exception normalization --- stem/socket.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index 4105152f..a62bb6b3 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -669,14 +669,8 @@ def recv_message(control_file, arrived_at = None): log.info(ERROR_MSG % ('SocketClosed', 'socket file has been closed')) raise stem.SocketClosed('socket file has been closed') - except (socket.error, ValueError) as exc: - # When disconnected we get... - # - # Python 2: - # socket.error: [Errno 107] Transport endpoint is not connected - # - # Python 3: - # ValueError: I/O operation on closed file. + except ValueError as exc: + # when disconnected this errors with 'I/O operation on closed file' log.info(ERROR_MSG % ('SocketClosed', 'received exception "%s"' % exc)) raise stem.SocketClosed(exc)

1 0

[stem/master] Drop BytesIO TODO comment
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit 21faefda9f4bdfafd7d454ecf2909daaad654140 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 12:31:41 2020 -0800 Drop BytesIO TODO comment BytesIO is great to concatenate large data or turn strings into file objects, but I'm kinda unsure why I wanted one here. This buffer both adds *and* pop off data, and BytesIO are kinda clunky at the later. Perhaps there's a good reason I'm forgetting and we'll do so in the end, but for now just dropping the TODO. --- stem/client/__init__.py | 8 -------- stem/process.py | 9 +++------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 307bd4e4..2abeac88 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -64,14 +64,6 @@ class Relay(object): """ def __init__(self, orport, link_protocol): - # TODO: Python 3.x adds a getbuffer() method which - # lets us get the size... - # - # https://stackoverflow.com/questions/26827055/python-how-to-get-iobytes-allo… - # - # When we drop python 2.x support we should replace - # self._orport_buffer with an io.BytesIO. - self.link_protocol = LinkProtocol(link_protocol) self._orport = orport self._orport_buffer = b'' # unread bytes diff --git a/stem/process.py b/stem/process.py index 4ed10dfb..3f1a0e19 100644 --- a/stem/process.py +++ b/stem/process.py @@ -143,12 +143,9 @@ def launch_tor(tor_cmd = 'tor', args = None, torrc_path = None, completion_perce last_problem = 'Timed out' while True: - # Tor's stdout will be read as ASCII bytes. This is fine for python 2, but - # in python 3 that means it'll mismatch with other operations (for instance - # the bootstrap_line.search() call later will fail). - # - # It seems like python 2.x is perfectly happy for this to be unicode, so - # normalizing to that. + # Tor's stdout will be read as ASCII bytes. That means it'll mismatch + # with other operations (for instance the bootstrap_line.search() call + # later will fail), so normalizing to unicode. init_line = tor_process.stdout.readline().decode('utf-8', 'replace').strip()

1 0

[stem/master] Drop check for python 2.6 style exception catching
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit f74f10dead195e82f3fb6d5d519e1f0fddf498f0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 12:49:13 2020 -0800 Drop check for python 2.6 style exception catching --- stem/util/test_tools.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 02d3dd89..d65b3ea4 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -471,21 +471,6 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa if '"""' in content: is_block_comment = not is_block_comment - if check_exception_keyword and content.startswith('except') and content.endswith(', exc:'): - # Python 2.6 - 2.7 supports two forms for exceptions... - # - # except ValueError, exc: - # except ValueError as exc: - # - # The former is the old method and no longer supported in python 3 - # going forward. - - # TODO: This check only works if the exception variable is called - # 'exc'. We should generalize this via a regex so other names work - # too. - - issues.setdefault(filename, []).append(Issue(index + 1, "except clause should use 'as', not comma", line)) - if prefer_single_quotes and not is_block_comment: if '"' in content and "'" not in content and '"""' not in content and not content.endswith('\\'): # Checking if the line already has any single quotes since that

1 0