update to flake8==3.3.0 with --ignore F405

16 files changed, 97 insertions, 38 deletions

diff --git a/_test/lib/canonical.py b/_test/lib/canonical.py
index 39dc87a..64f3153 100644
--- a/_test/lib/canonical.py
+++ b/_test/lib/canonical.py
@@ -18,7 +18,7 @@ class CanonicalScanner:
                 if isinstance(data, bytes):
                     data = data.decode('utf-8')
             else:
-                data = unicode(data, 'utf-8')
+                data = unicode(data, 'utf-8')  # NOQA
         except UnicodeDecodeError:
             raise CanonicalError("utf-8 stream is expected")
         self.data = data + u'\0'
@@ -48,7 +48,7 @@ class CanonicalScanner:
             self.scan()
         token = self.tokens.pop(0)
         if choice and not isinstance(token, choice):
-            raise CanonicalError("unexpected token "+repr(token))
+            raise CanonicalError("unexpected token " + repr(token))
         return token
 
     def get_token_value(self):
@@ -65,7 +65,7 @@ class CanonicalScanner:
                 break
             elif ch == u'%':
                 self.tokens.append(self.scan_directive())
-            elif ch == u'-' and self.data[self.index:self.index+3] == u'---':
+            elif ch == u'-' and self.data[self.index:self.index + 3] == u'---':
                 self.index += 3
                 self.tokens.append(ruamel.yaml.DocumentStartToken(None, None))
             elif ch == u'[':
@@ -102,8 +102,8 @@ class CanonicalScanner:
     DIRECTIVE = u'%YAML 1.1'
 
     def scan_directive(self):
-        if self.data[self.index:self.index+len(self.DIRECTIVE)] == self.DIRECTIVE and \
-                self.data[self.index+len(self.DIRECTIVE)] in u' \n\0':
+        if self.data[self.index:self.index + len(self.DIRECTIVE)] == self.DIRECTIVE and \
+                self.data[self.index + len(self.DIRECTIVE)] in u' \n\0':
             self.index += len(self.DIRECTIVE)
             return ruamel.yaml.DirectiveToken('YAML', (1, 1), None, None)
         else:
@@ -130,11 +130,11 @@ class CanonicalScanner:
         if not value:
             value = u'!'
         elif value[0] == u'!':
-            value = 'tag:yaml.org,2002:'+value[1:]
+            value = 'tag:yaml.org,2002:' + value[1:]
         elif value[0] == u'<' and value[-1] == u'>':
             value = value[1:-1]
         else:
-            value = u'!'+value
+            value = u'!' + value
         return ruamel.yaml.TagToken(value, None, None)
 
     QUOTE_CODES = {
@@ -179,7 +179,7 @@ class CanonicalScanner:
                     ignore_spaces = True
                 elif ch in self.QUOTE_CODES:
                     length = self.QUOTE_CODES[ch]
-                    code = int(self.data[self.index:self.index+length], 16)
+                    code = int(self.data[self.index:self.index + length], 16)
                     chunks.append(unichr(code))
                     self.index += length
                 else:
@@ -233,7 +233,7 @@ class CanonicalParser:
             if self.check_token(ruamel.yaml.DirectiveToken, ruamel.yaml.DocumentStartToken):
                 self.parse_document()
             else:
-                raise CanonicalError("document is expected, got "+repr(self.tokens[0]))
+                raise CanonicalError("document is expected, got " + repr(self.tokens[0]))
         self.get_token(ruamel.yaml.StreamEndToken)
         self.events.append(ruamel.yaml.StreamEndEvent(None, None))
 
@@ -340,40 +340,47 @@ class CanonicalLoader(CanonicalScanner, CanonicalParser,
         Constructor.__init__(self)
         Resolver.__init__(self)
 
+
 ruamel.yaml.CanonicalLoader = CanonicalLoader
 
 
 def canonical_scan(stream):
     return ruamel.yaml.scan(stream, Loader=CanonicalLoader)
 
+
 ruamel.yaml.canonical_scan = canonical_scan
 
 
 def canonical_parse(stream):
     return ruamel.yaml.parse(stream, Loader=CanonicalLoader)
 
+
 ruamel.yaml.canonical_parse = canonical_parse
 
 
 def canonical_compose(stream):
     return ruamel.yaml.compose(stream, Loader=CanonicalLoader)
 
+
 ruamel.yaml.canonical_compose = canonical_compose
 
 
 def canonical_compose_all(stream):
     return ruamel.yaml.compose_all(stream, Loader=CanonicalLoader)
 
+
 ruamel.yaml.canonical_compose_all = canonical_compose_all
 
 
 def canonical_load(stream):
     return ruamel.yaml.load(stream, Loader=CanonicalLoader)
 
+
 ruamel.yaml.canonical_load = canonical_load
 
 
 def canonical_load_all(stream):
     return ruamel.yaml.load_all(stream, Loader=CanonicalLoader)
 
+
 ruamel.yaml.canonical_load_all = canonical_load_all
diff --git a/_test/lib/test_all.py b/_test/lib/test_all.py
index 57485fc..9e951eb 100644
--- a/_test/lib/test_all.py
+++ b/_test/lib/test_all.py
@@ -13,5 +13,6 @@ def main(args=None):
         collections.append(test_yaml_ext)
     test_appliance.run(collections, args)
 
+
 if __name__ == '__main__':
     main()
diff --git a/_test/lib/test_appliance.py b/_test/lib/test_appliance.py
index fd957ad..a96052d 100644
--- a/_test/lib/test_appliance.py
+++ b/_test/lib/test_appliance.py
@@ -110,7 +110,7 @@ def execute(function, filenames, verbose):
         else:
             name = function.func_name
     if verbose:
-        sys.stdout.write('='*75+'\n')
+        sys.stdout.write('=' * 75 + '\n')
         sys.stdout.write('%s(%s)...\n' % (name, ', '.join(filenames)))
     try:
         function(verbose=verbose, *filenames)
@@ -147,7 +147,7 @@ def display(results, verbose):
             failures += 1
         if kind == 'ERROR':
             errors += 1
-        sys.stdout.write('='*75+'\n')
+        sys.stdout.write('=' * 75 + '\n')
         sys.stdout.write('%s(%s): %s\n' % (name, ', '.join(filenames), kind))
         if kind == 'ERROR':
             traceback.print_exception(file=sys.stdout, *info)
@@ -155,11 +155,11 @@ def display(results, verbose):
             sys.stdout.write('Traceback (most recent call last):\n')
             traceback.print_tb(info[2], file=sys.stdout)
             sys.stdout.write('%s: see below\n' % info[0].__name__)
-            sys.stdout.write('~'*75+'\n')
+            sys.stdout.write('~' * 75 + '\n')
             for arg in info[1].args:
                 pprint.pprint(arg, stream=sys.stdout)
         for filename in filenames:
-            sys.stdout.write('-'*75+'\n')
+            sys.stdout.write('-' * 75 + '\n')
             sys.stdout.write('%s:\n' % filename)
             if PY3:
                 with open(filename, 'r', errors='replace') as fp:
@@ -170,7 +170,7 @@ def display(results, verbose):
             sys.stdout.write(data)
             if data and data[-1] != '\n':
                 sys.stdout.write('\n')
-    sys.stdout.write('='*75+'\n')
+    sys.stdout.write('=' * 75 + '\n')
     sys.stdout.write('TESTS: %s\n' % total)
     ret_val = 0
     if failures:
@@ -203,7 +203,7 @@ def run(collections, args=None):
                 for ext in function.unittest:
                     if ext not in exts:
                         break
-                    filenames.append(os.path.join(DATA, base+ext))
+                    filenames.append(os.path.join(DATA, base + ext))
                 else:
                     skip_exts = getattr(function, 'skip', [])
                     for skip_ext in skip_exts:
diff --git a/_test/lib/test_canonical.py b/_test/lib/test_canonical.py
index 33387cd..682f6ab 100644
--- a/_test/lib/test_canonical.py
+++ b/_test/lib/test_canonical.py
@@ -14,6 +14,7 @@ def test_canonical_scanner(canonical_filename, verbose=False):
         for token in tokens:
             print(token)
 
+
 test_canonical_scanner.unittest = ['.canonical']
 
 
@@ -26,6 +27,7 @@ def test_canonical_parser(canonical_filename, verbose=False):
         for event in events:
             print(event)
 
+
 test_canonical_parser.unittest = ['.canonical']
 
 
@@ -40,6 +42,7 @@ def test_canonical_error(data_filename, canonical_filename, verbose=False):
     else:
         raise AssertionError("expected an exception")
 
+
 test_canonical_error.unittest = ['.data', '.canonical']
 test_canonical_error.skip = ['.empty']
 
diff --git a/_test/lib/test_constructor.py b/_test/lib/test_constructor.py
index fa8d8df..87e7a6d 100644
--- a/_test/lib/test_constructor.py
+++ b/_test/lib/test_constructor.py
@@ -131,7 +131,7 @@ def _make_objects():
             return self
 
         def __cmp__(self, other):
-            return cmp((type(self), self.foo, self.bar, self.baz),
+            return cmp((type(self), self.foo, self.bar, self.baz),  # NOQA
                        (type(other), other.foo, other.bar, other.baz))
 
         def __eq__(self, other):
@@ -145,7 +145,7 @@ def _make_objects():
             self.baz = baz
 
         def __cmp__(self, other):
-            return cmp((type(self), self.foo, self.bar, self.baz),
+            return cmp((type(self), self.foo, self.bar, self.baz),  # NOQA
                        (type(other), other.foo, other.bar, other.baz))
 
         def __eq__(self, other):
@@ -225,7 +225,7 @@ def _make_objects():
 
     class MyList(list):
         def __init__(self, n=1):
-            self.extend([None]*n)
+            self.extend([None] * n)
 
         def __eq__(self, other):
             return type(self) is type(other) and list(self) == list(other)
@@ -254,6 +254,7 @@ def _make_objects():
 
     today = datetime.date.today()
 
+
 try:
     from ruamel.ordereddict import ordereddict
 except:
@@ -281,7 +282,7 @@ def _serialize_value(data):
         return '{%s}' % ', '.join(items)
     elif isinstance(data, datetime.datetime):
         return repr(data.utctimetuple())
-    elif PY2 and isinstance(data, unicode):
+    elif PY2 and isinstance(data, unicode):  # NOQA
         return data.encode('utf-8')
     elif isinstance(data, float) and data != data:
         return '?'
@@ -319,6 +320,7 @@ def test_constructor_types(data_filename, code_filename, verbose=False):
             print("NATIVE2:")
             pprint.pprint(native2)
 
+
 test_constructor_types.unittest = ['.data', '.code']
 
 
@@ -344,6 +346,7 @@ def test_roundtrip_data(code_filename, roundtrip_filename, verbose=False):
             print("NATIVE2:")
             pprint.pprint(native2)
 
+
 test_roundtrip_data.unittest = ['.data', '.roundtrip']
 
 
diff --git a/_test/lib/test_emitter.py b/_test/lib/test_emitter.py
index 7fff498..4b6fb76 100644
--- a/_test/lib/test_emitter.py
+++ b/_test/lib/test_emitter.py
@@ -13,7 +13,7 @@ def _compare_events(events1, events2):
         if isinstance(event1, yaml.CollectionStartEvent):
             assert event1.tag == event2.tag, (event1, event2)
         if isinstance(event1, yaml.ScalarEvent):
-            if True not in event1.implicit+event2.implicit:
+            if True not in event1.implicit + event2.implicit:
                 assert event1.tag == event2.tag, (event1, event2)
             assert event1.value == event2.value, (event1, event2)
 
@@ -28,6 +28,7 @@ def test_emitter_on_data(data_filename, canonical_filename, verbose=False):
     new_events = list(yaml.parse(output))
     _compare_events(events, new_events)
 
+
 test_emitter_on_data.unittest = ['.data', '.canonical']
 
 
@@ -42,6 +43,7 @@ def test_emitter_on_canonical(canonical_filename, verbose=False):
         new_events = list(yaml.parse(output))
         _compare_events(events, new_events)
 
+
 test_emitter_on_canonical.unittest = ['.canonical']
 
 
@@ -71,6 +73,7 @@ def test_emitter_styles(data_filename, canonical_filename, verbose=False):
                 new_events = list(yaml.parse(output))
                 _compare_events(events, new_events)
 
+
 test_emitter_styles.unittest = ['.data', '.canonical']
 
 
@@ -81,7 +84,7 @@ class EventsLoader(yaml.Loader):
             mapping = {}
         else:
             mapping = self.construct_mapping(node)
-        class_name = str(node.tag[1:])+'Event'
+        class_name = str(node.tag[1:]) + 'Event'
         if class_name in ['AliasEvent', 'ScalarEvent', 'SequenceStartEvent',
                           'MappingStartEvent']:
             mapping.setdefault('anchor', None)
@@ -98,6 +101,7 @@ class EventsLoader(yaml.Loader):
 # if Loader is not a composite, add this function
 # EventsLoader.add_constructor = yaml.constructor.Constructor.add_constructor
 
+
 EventsLoader.add_constructor(None, EventsLoader.construct_event)
 
 
@@ -111,6 +115,7 @@ def test_emitter_events(events_filename, verbose=False):
     new_events = list(yaml.parse(output))
     _compare_events(events, new_events)
 
+
 if __name__ == '__main__':
     import test_appliance
     test_appliance.run(globals())
diff --git a/_test/lib/test_errors.py b/_test/lib/test_errors.py
index 9576c90..cfaa000 100644
--- a/_test/lib/test_errors.py
+++ b/_test/lib/test_errors.py
@@ -17,6 +17,7 @@ def test_loader_error(error_filename, verbose=False):
     else:
         raise AssertionError("expected an exception")
 
+
 test_loader_error.unittest = ['.loader-error']
 
 
@@ -30,6 +31,7 @@ def test_loader_error_string(error_filename, verbose=False):
     else:
         raise AssertionError("expected an exception")
 
+
 test_loader_error_string.unittest = ['.loader-error']
 
 
@@ -43,6 +45,7 @@ def test_loader_error_single(error_filename, verbose=False):
     else:
         raise AssertionError("expected an exception")
 
+
 test_loader_error_single.unittest = ['.single-loader-error']
 
 
@@ -58,6 +61,7 @@ def test_emitter_error(error_filename, verbose=False):
     else:
         raise AssertionError("expected an exception")
 
+
 test_emitter_error.unittest = ['.emitter-error']
 
 
@@ -73,6 +77,7 @@ def test_dumper_error(error_filename, verbose=False):
     else:
         raise AssertionError("expected an exception")
 
+
 test_dumper_error.unittest = ['.dumper-error']
 
 if __name__ == '__main__':
diff --git a/_test/lib/test_input_output.py b/_test/lib/test_input_output.py
index 399a263..d83cb5a 100644
--- a/_test/lib/test_input_output.py
+++ b/_test/lib/test_input_output.py
@@ -31,9 +31,9 @@ if PY3:
         output = yaml.load(StringIO(data))
         assert output == value, (output, value)
         for input in [data.encode('utf-8'),
-                      codecs.BOM_UTF8+data.encode('utf-8'),
-                      codecs.BOM_UTF16_BE+data.encode('utf-16-be'),
-                      codecs.BOM_UTF16_LE+data.encode('utf-16-le')]:
+                      codecs.BOM_UTF8 + data.encode('utf-8'),
+                      codecs.BOM_UTF16_BE + data.encode('utf-16-be'),
+                      codecs.BOM_UTF16_LE + data.encode('utf-16-le')]:
             if verbose:
                 print("INPUT:", repr(input[:10]), "...")
             output = yaml.load(input)
@@ -48,9 +48,9 @@ else:
         output = yaml.load(_unicode_open(StringIO(data.encode('utf-8')), 'utf-8'))
         assert output == value, (output, value)
         for input in [data, data.encode('utf-8'),
-                      codecs.BOM_UTF8+data.encode('utf-8'),
-                      codecs.BOM_UTF16_BE+data.encode('utf-16-be'),
-                      codecs.BOM_UTF16_LE+data.encode('utf-16-le')]:
+                      codecs.BOM_UTF8 + data.encode('utf-8'),
+                      codecs.BOM_UTF16_BE + data.encode('utf-16-be'),
+                      codecs.BOM_UTF16_LE + data.encode('utf-16-le')]:
             if verbose:
                 print("INPUT:", repr(input[:10]), "...")
             output = yaml.load(input)
@@ -66,9 +66,9 @@ def test_unicode_input_errors(unicode_filename, verbose=False):
         data = fp.read().decode('utf-8')
     for input in [data.encode('latin1', 'ignore'),
                   data.encode('utf-16-be'), data.encode('utf-16-le'),
-                  codecs.BOM_UTF8+data.encode('utf-16-be'),
-                  codecs.BOM_UTF16_BE+data.encode('utf-16-le'),
-                  codecs.BOM_UTF16_LE+data.encode('utf-8')+b'!']:
+                  codecs.BOM_UTF8 + data.encode('utf-16-be'),
+                  codecs.BOM_UTF16_BE + data.encode('utf-16-le'),
+                  codecs.BOM_UTF16_LE + data.encode('utf-8') + b'!']:
         try:
             yaml.load(input)
         except yaml.YAMLError as exc:
@@ -84,6 +84,7 @@ def test_unicode_input_errors(unicode_filename, verbose=False):
         else:
             raise AssertionError("expected an exception")
 
+
 test_unicode_input_errors.unittest = ['.unicode']
 
 if PY3:
@@ -166,14 +167,15 @@ else:
                 assert isinstance(data2, str), (type(data2), encoding)
                 data2.decode('utf-8')
                 if encoding is None:
-                    assert isinstance(data3, unicode), (type(data3), encoding)
-                    assert isinstance(data4, unicode), (type(data4), encoding)
+                    assert isinstance(data3, unicode), (type(data3), encoding) # NOQA
+                    assert isinstance(data4, unicode), (type(data4), encoding) # NOQA
                 else:
                     assert isinstance(data3, str), (type(data3), encoding)
                     data3.decode(encoding)
                     assert isinstance(data4, str), (type(data4), encoding)
                     data4.decode(encoding)
 
+
 test_unicode_output.unittest = ['.unicode']
 
 
@@ -220,6 +222,7 @@ def test_file_output(unicode_filename, verbose=False):
         if os.path.exists(filename):
             os.unlink(filename)
 
+
 test_file_output.unittest = ['.unicode']
 
 
@@ -230,7 +233,7 @@ def test_unicode_transfer(unicode_filename, verbose=False):
         input = data
         if PY3:
             if encoding is not None:
-                input = ('\ufeff'+input).encode(encoding)
+                input = ('\ufeff' + input).encode(encoding)
             output1 = yaml.emit(yaml.parse(input), allow_unicode=True)
             if encoding is None:
                 stream = StringIO()
@@ -246,19 +249,20 @@ def test_unicode_transfer(unicode_filename, verbose=False):
                 output2.decode(encoding)
         else:
             if encoding is not None:
-                input = (u'\ufeff'+input).encode(encoding)
+                input = (u'\ufeff' + input).encode(encoding)
             output1 = yaml.emit(yaml.parse(input), allow_unicode=True)
             stream = StringIO()
             yaml.emit(yaml.parse(input), _unicode_open(stream, 'utf-8'), allow_unicode=True)
             output2 = stream.getvalue()
             if encoding is None:
-                assert isinstance(output1, unicode), (type(output1), encoding)
+                assert isinstance(output1, unicode), (type(output1), encoding)  # NOQA
             else:
                 assert isinstance(output1, str), (type(output1), encoding)
                 output1.decode(encoding)
             assert isinstance(output2, str), (type(output2), encoding)
             output2.decode('utf-8')
 
+
 test_unicode_transfer.unittest = ['.unicode']
 
 if __name__ == '__main__':
diff --git a/_test/lib/test_mark.py b/_test/lib/test_mark.py
index 56cb52f..4e0728f 100644
--- a/_test/lib/test_mark.py
+++ b/_test/lib/test_mark.py
@@ -28,7 +28,8 @@ def test_marks(marks_filename, verbose=False):
         assert snippet.count('\n') == 1, snippet.count('\n')
         data, pointer = snippet.split('\n')
         assert len(data) < 82, len(data)
-        assert data[len(pointer)-1] == '*', data[len(pointer)-1]
+        assert data[len(pointer) - 1] == '*', data[len(pointer) - 1]
+
 
 test_marks.unittest = ['.marks']
 
diff --git a/_test/lib/test_reader.py b/_test/lib/test_reader.py
index ce5de81..7ce0dc9 100644
--- a/_test/lib/test_reader.py
+++ b/_test/lib/test_reader.py
@@ -29,7 +29,7 @@ def test_stream_error(error_filename, verbose=False):
         try:
             if PY2:
                 with open(error_filename, 'rb') as fp0:
-                    data = unicode(fp0.read(), encoding)
+                    data = unicode(fp0.read(), encoding)  # NOQA
             else:
                 with open(error_filename, 'rb') as fp0:
                     data = fp0.read().decode(encoding)
@@ -42,6 +42,7 @@ def test_stream_error(error_filename, verbose=False):
     with io.open(error_filename, encoding=encoding) as fp:
         _run_reader(fp, verbose)
 
+
 test_stream_error.unittest = ['.stream-error']
 
 if __name__ == '__main__':
diff --git a/_test/lib/test_recursive.py b/_test/lib/test_recursive.py
index 824ceaa..e7084e7 100644
--- a/_test/lib/test_recursive.py
+++ b/_test/lib/test_recursive.py
@@ -48,6 +48,7 @@ def test_recursive(recursive_filename, verbose=False):
             print("OUTPUT2:")
             print(output2)
 
+
 test_recursive.unittest = ['.recursive']
 
 if __name__ == '__main__':
diff --git a/_test/lib/test_representer.py b/_test/lib/test_representer.py
index 6b449a8..2c7e2c8 100644
--- a/_test/lib/test_representer.py
+++ b/_test/lib/test_representer.py
@@ -39,6 +39,7 @@ def test_representer_types(code_filename, verbose=False):
                     print("OUTPUT:")
                     print(output)
 
+
 test_representer_types.unittest = ['.code']
 
 if __name__ == '__main__':
diff --git a/_test/lib/test_resolver.py b/_test/lib/test_resolver.py
index 64d401d..4d1e6a4 100644
--- a/_test/lib/test_resolver.py
+++ b/_test/lib/test_resolver.py
@@ -25,6 +25,7 @@ def test_implicit_resolver(data_filename, detect_filename, verbose=False):
                 print("CHILDREN:")
                 pprint.pprint(node.value)
 
+
 test_implicit_resolver.unittest = ['.data', '.detect']
 
 
@@ -81,6 +82,7 @@ def test_path_resolver_loader(data_filename, path_filename, verbose=False):
         if verbose:
             print(yaml.serialize_all(nodes1))
 
+
 test_path_resolver_loader.unittest = ['.data', '.path']
 
 
@@ -99,6 +101,7 @@ def test_path_resolver_dumper(data_filename, path_filename, verbose=False):
             data2 = _convert_node(node2)
             assert data1 == data2, (data1, data2)
 
+
 test_path_resolver_dumper.unittest = ['.data', '.path']
 
 if __name__ == '__main__':
diff --git a/_test/lib/test_structure.py b/_test/lib/test_structure.py
index a23dac8..4d04b11 100644
--- a/_test/lib/test_structure.py
+++ b/_test/lib/test_structure.py
@@ -61,6 +61,7 @@ def test_structure(data_filename, structure_filename, verbose=False):
             print("NODES2:")
             pprint.pprint(nodes2)
 
+
 test_structure.unittest = ['.data', '.structure']
 
 
@@ -93,6 +94,7 @@ def test_parser(data_filename, canonical_filename, verbose=False):
             print("EVENTS2:")
             pprint.pprint(events2)
 
+
 test_parser.unittest = ['.data', '.canonical']
 
 
@@ -112,6 +114,7 @@ def test_parser_on_canonical(canonical_filename, verbose=False):
             print("EVENTS2:")
             pprint.pprint(events2)
 
+
 test_parser_on_canonical.unittest = ['.canonical']
 
 
@@ -148,6 +151,7 @@ def test_composer(data_filename, canonical_filename, verbose=False):
             print("NODES2:")
             pprint.pprint(nodes2)
 
+
 test_composer.unittest = ['.data', '.canonical']
 
 
@@ -208,6 +212,7 @@ def test_constructor(data_filename, canonical_filename, verbose=False):
             print("NATIVE2:")
             pprint.pprint(native2)
 
+
 test_constructor.unittest = ['.data', '.canonical']
 
 if __name__ == '__main__':
diff --git a/_test/lib/test_tokens.py b/_test/lib/test_tokens.py
index be067f0..e240efe 100644
--- a/_test/lib/test_tokens.py
+++ b/_test/lib/test_tokens.py
@@ -64,6 +64,7 @@ def test_tokens(data_filename, tokens_filename, verbose=False):
     for token1, token2 in zip(tokens1, tokens2):
         assert token1 == token2, (token1, token2)
 
+
 test_tokens.unittest = ['.data', '.tokens']
 
 
@@ -78,6 +79,7 @@ def test_scanner(data_filename, canonical_filename, verbose=False):
             if verbose:
                 pprint.pprint(tokens)
 
+
 test_scanner.unittest = ['.data', '.canonical']
 
 if __name__ == '__main__':
diff --git a/_test/lib/test_yaml_ext.py b/_test/lib/test_yaml_ext.py
index ebb9f58..c4a1493 100644
--- a/_test/lib/test_yaml_ext.py
+++ b/_test/lib/test_yaml_ext.py
@@ -22,84 +22,98 @@ old_scan = ruamel.yaml.scan
 def new_scan(stream, Loader=ruamel.yaml.CLoader):
     return old_scan(stream, Loader)
 
+
 old_parse = ruamel.yaml.parse
 
 
 def new_parse(stream, Loader=ruamel.yaml.CLoader):
     return old_parse(stream, Loader)
 
+
 old_compose = ruamel.yaml.compose
 
 
 def new_compose(stream, Loader=ruamel.yaml.CLoader):
     return old_compose(stream, Loader)
 
+
 old_compose_all = ruamel.yaml.compose_all
 
 
 def new_compose_all(stream, Loader=ruamel.yaml.CLoader):
     return old_compose_all(stream, Loader)
 
+
 old_load = ruamel.yaml.load
 
 
 def new_load(stream, Loader=ruamel.yaml.CLoader):
     return old_load(stream, Loader)
 
+
 old_load_all = ruamel.yaml.load_all
 
 
 def new_load_all(stream, Loader=ruamel.yaml.CLoader):
     return old_load_all(stream, Loader)
 
+
 old_safe_load = ruamel.yaml.safe_load
 
 
 def new_safe_load(stream):
     return old_load(stream, ruamel.yaml.CSafeLoader)
 
+
 old_safe_load_all = ruamel.yaml.safe_load_all
 
 
 def new_safe_load_all(stream):
     return old_load_all(stream, ruamel.yaml.CSafeLoader)
 
+
 old_emit = ruamel.yaml.emit
 
 
 def new_emit(events, stream=None, Dumper=ruamel.yaml.CDumper, **kwds):
     return old_emit(events, stream, Dumper, **kwds)
 
+
 old_serialize = ruamel.yaml.serialize
 
 
 def new_serialize(node, stream, Dumper=ruamel.yaml.CDumper, **kwds):
     return old_serialize(node, stream, Dumper, **kwds)
 
+
 old_serialize_all = ruamel.yaml.serialize_all
 
 
 def new_serialize_all(nodes, stream=None, Dumper=ruamel.yaml.CDumper, **kwds):
     return old_serialize_all(nodes, stream, Dumper, **kwds)
 
+
 old_dump = ruamel.yaml.dump
 
 
 def new_dump(data, stream=None, Dumper=ruamel.yaml.CDumper, **kwds):
     return old_dump(data, stream, Dumper, **kwds)
 
+
 old_dump_all = ruamel.yaml.dump_all
 
 
 def new_dump_all(documents, stream=None, Dumper=ruamel.yaml.CDumper, **kwds):
     return old_dump_all(documents, stream, Dumper, **kwds)
 
+
 old_safe_dump = ruamel.yaml.safe_dump
 
 
 def new_safe_dump(data, stream=None, **kwds):
     return old_dump(data, stream, ruamel.yaml.CSafeDumper, **kwds)
 
+
 old_safe_dump_all = ruamel.yaml.safe_dump_all
 
 
@@ -207,6 +221,7 @@ def test_c_scanner(data_filename, canonical_filename, verbose=False):
         with open(canonical_filename, 'rb') as fp1:
             _compare_scanners(fp0.read(), fp1.read(), verbose)
 
+
 test_c_scanner.unittest = ['.data', '.canonical']
 test_c_scanner.skip = ['.skip-ext']
 
@@ -246,6 +261,7 @@ def test_c_parser(data_filename, canonical_filename, verbose=False):
         with open(canonical_filename, 'rb') as fp1:
             _compare_parsers(fp0.read(), fp1.read(), verbose)
 
+
 test_c_parser.unittest = ['.data', '.canonical']
 test_c_parser.skip = ['.skip-ext']
 
@@ -289,6 +305,7 @@ def test_c_emitter(data_filename, canonical_filename, verbose=False):
     with open(canonical_filename, 'rb') as fp0:
         _compare_emitters(fp0.read(), verbose)
 
+
 test_c_emitter.unittest = ['.data', '.canonical']
 test_c_emitter.skip = ['.skip-ext']
 
@@ -309,7 +326,7 @@ def wrap_ext_function(function):
             pass
         wrapper.unittest_name = '%s_ext' % function.__name__
     wrapper.unittest = function.unittest
-    wrapper.skip = getattr(function, 'skip', [])+['.skip-ext']
+    wrapper.skip = getattr(function, 'skip', []) + ['.skip-ext']
     return wrapper