Merge pull request #39 from stchris/feature/flake8

Feature/flake8

.travis.yml

@@ -9,6 +9,7 @@ python:
     - pypy
 install:
   - pip install coveralls
+  - pip install tox
 script:
   coverage run --source=untangle ./setup.py test
 

CHANGELOG.md

@@ -1,6 +1,9 @@
 Changelog
 ---------
 
+Unreleased
+- flake8 now runs as part of the unit tests. Fully replaced nose with tox as a test runner.
+
 1.1.1
 - addded generic SAX feature toggle ([#26](https://github.com/stchris/untangle/pull/26))
 - added support for `hasattribute`/`getattribute` ([#15](https://github.com/stchris/untangle/pull/15))

examples.py

@@ -41,6 +41,7 @@ def access_cdata():
     )
     return ("%s" % (o.node.cdata))
 
+
 examples = [
     ('Access children with parent.children and'
      ' attributes with element["attribute"]', access),

setup.py

@@ -28,7 +28,7 @@
 from setuptools import setup
 
 if sys.argv[-1] == 'test':
-    os.system('nosetests tests/tests.py')
+    os.system('tox')
     sys.exit()
 
 setup(
@@ -54,7 +54,6 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
     ),
-    test_suite = 'nose.collector'
 )
 
 # vim: set expandtab ts=4 sw=4:

tests/tests.py

@@ -173,7 +173,7 @@ def test_namespace(self):
             template.table.tr.xsl_for_each.td['class']
         )
         self.assertEquals(
-            untangle.Element('',''),
+            untangle.Element('', ''),
             template.table.tr.xsl_for_each.td.xsl_apply_templates
         )
 
@@ -185,7 +185,7 @@ def test_namespace(self):
             last_template.p['class']
         )
         self.assertEquals(
-            untangle.Element('xsl_apply_templates',''),
+            untangle.Element('xsl_apply_templates', ''),
             last_template.p.xsl_apply_templates
         )
 

tox.ini

@@ -4,9 +4,17 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py33, py34, py35, py36, pypy
+envlist = flake8, py26, py27, py33, py34, py35, py36, pypy
 skip_missing_interpreters = true
 
 [testenv]
 commands = py.test tests/tests.py
 deps = pytest
+
+[testenv:flake8]
+basepython=python
+deps=flake8
+commands=flake8 .
+
+[flake8]
+exclude = .git,__pycache__,docs/conf.py,old,build,dist,.tox

untangle.py

@@ -21,9 +21,12 @@
     from io import StringIO
 try:
     from types import StringTypes
-    is_string = lambda x: isinstance(x, StringTypes)
+
+    def is_string(x):
+        return isinstance(x, StringTypes)
 except ImportError:
-    is_string = lambda x: isinstance(x, str)
+    def is_string(x):
+        return isinstance(x, str)
 
 __version__ = '1.1.1'