Merge pull request beeware#333 from freakboy3742/master

Threw a dryer sheet into the code.

.travis.yml

@@ -12,5 +12,7 @@ install:
   - "pip install ."
   - "pip install pytest"
   - "pip install git+https://github.com/pybee/pytest-circleci"
+  - "pip install flake8"
 script:
   - "py.test tests"
+  - flake8

setup.cfg

@@ -1,10 +1,8 @@
-[isort]
-combine_as_imports = true
-default_section = THIRDPARTY
-include_trailing_comma = true
-line_length = 79
-multi_line_output = 5
-not_skip = __init__.py
-known_standard_library = marshal
-known_first_party = voc
-sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+[flake8]
+# https://flake8.readthedocs.org/en/latest/
+exclude=local/*,docs/*,settings.py,*/migrations/*
+max-complexity = 10
+max-line-length = 119
+ignore = E121,E123,E126,E226,E24,E704,W503,W504,C901
+[metadata]
+description-file = README.md

setup.py

@@ -1,13 +1,11 @@
 #!/usr/bin/env python3
-import sys
-
-if sys.version_info[:2] < (3, 4):
-    raise SystemExit("VOC requires Python 3.4+")
-
 import io
 import re
 from setuptools import setup, find_packages
+import sys
 
+if sys.version_info[:2] < (3, 4):
+    raise SystemExit("VOC requires Python 3.4+")
 
 with io.open('./voc/__init__.py', encoding='utf8') as version_file:
     version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), re.M)

tests/builtins/test_input.py

@@ -1,4 +1,4 @@
-from .. utils import TranspileTestCase, BuiltinFunctionTestCase
+from .. utils import TranspileTestCase  # , BuiltinFunctionTestCase
 
 
 class InputTests(TranspileTestCase):

tests/builtins/test_next.py

@@ -1,5 +1,3 @@
-from unittest import expectedFailure
-
 from .. utils import TranspileTestCase, BuiltinFunctionTestCase
 
 

tests/builtins/test_pow.py

@@ -1,5 +1,3 @@
-from unittest import expectedFailure
-
 from .. utils import TranspileTestCase, BuiltinFunctionTestCase, BuiltinTwoargFunctionTestCase
 
 

tests/builtins/test_setattr.py

@@ -1,4 +1,4 @@
-from .. utils import TranspileTestCase, BuiltinTwoargFunctionTestCase
+from .. utils import TranspileTestCase
 
 
 class SetattrTests(TranspileTestCase):

tests/builtins/test_sum.py

@@ -1,5 +1,3 @@
-from unittest import expectedFailure
-
 from .. utils import TranspileTestCase, BuiltinFunctionTestCase
 
 

tests/datatypes/test_bytearray.py

@@ -1,5 +1,3 @@
-from unittest import expectedFailure
-
 from .. utils import TranspileTestCase, UnaryOperationTestCase, BinaryOperationTestCase, InplaceOperationTestCase
 
 

tests/datatypes/test_bytes.py

@@ -1,5 +1,3 @@
-from unittest import expectedFailure
-
 from .. utils import TranspileTestCase, UnaryOperationTestCase, BinaryOperationTestCase, InplaceOperationTestCase
 
 

tests/datatypes/test_complex.py

@@ -1,6 +1,5 @@
 from .. utils import TranspileTestCase, UnaryOperationTestCase, BinaryOperationTestCase, InplaceOperationTestCase
 
-from unittest import expectedFailure
 
 class UnaryComplexOperationTests(UnaryOperationTestCase, TranspileTestCase):
     data_type = 'complex'

tests/datatypes/test_float.py

@@ -1,5 +1,3 @@
-from unittest import expectedFailure
-
 from .. utils import TranspileTestCase, UnaryOperationTestCase, BinaryOperationTestCase, InplaceOperationTestCase
 
 

tests/datatypes/test_frozenset.py

@@ -1,7 +1,5 @@
 from .. utils import TranspileTestCase, UnaryOperationTestCase, BinaryOperationTestCase, InplaceOperationTestCase
 
-import unittest
-
 
 class FrozensetTests(TranspileTestCase):
     pass

tests/datatypes/test_str.py

@@ -1,4 +1,3 @@
-
 from .. utils import TranspileTestCase, UnaryOperationTestCase, BinaryOperationTestCase, InplaceOperationTestCase
 
 
@@ -29,10 +28,9 @@ def test_endswith(self):
             print(s.endswith(end))
             """)
 
-
-        #self.assertCodeExecution("""
-        #  print('abracadabra'.endswith('abra'))
-        #    """)
+        # self.assertCodeExecution("""
+        #     print('abracadabra'.endswith('abra'))
+        #     """)
 
     def test_getattr(self):
         self.assertCodeExecution("""

tests/structures/test_assert.py

@@ -20,4 +20,4 @@ def test_assert_without_message(self):
             print("Pre assert 2")
             assert x < 0
             print("Done.")
-            """)
+            """)

tests/structures/test_decorators.py

@@ -1,5 +1,3 @@
-from unittest import expectedFailure
-
 from ..utils import TranspileTestCase
 
 

tests/structures/test_exception.py

@@ -78,7 +78,8 @@ class MyException(Exception):
 
     @expectedFailure
     def test_raise_custom_exception_import_from(self):
-        self.assertCodeExecution("""
+        self.assertCodeExecution(
+            """
             from example import *
 
             try: