Fixed several bugs reported by linter (flake8)

Signed-off-by: Sorin Sbarnea <[email protected]>

Author: ssbarnea

.gitignore

@@ -5,6 +5,10 @@ dist
 .tox
 ~*.*
 build/
-.idea/inspectionProfiles/
+.idea/
 .python-version
 .vscode
+/.idea/misc.xml
+/.idea/modules.xml
+/.cache
+/.eggs

.idea/misc.xml

@@ -1,74 +1,100 @@
 language: python
 sudo: false
+matrix:
+  fast_finish: false
 os:
 - linux
 python:
 - '2.7'
 - '3.4'
 - '3.5'
 install:
-- pip -q install -r requirements.txt
-- pip -q install -r requirements-dev.txt
+- pip -q --log dist/pip.log install --upgrade pip setuptools py
+- pip -q --log dist/pip.log install -r requirements.txt -r requirements-dev.txt
+- pip check
 script:
-- curl --silent -Lo travis_after_all.py https://raw.github.com/pycontribs/travis_after_all/master/travis_after_all.py && travis_wait python setup.py prerelease test
-- export PACKAGE_VERSION=$(python -c "from wstools.version import __version__; print(__version__)")
+- travis_wait python setup.py test
+- export PACKAGE_NAME=$(python setup.py --name)
+- export PACKAGE_VERSION=$(python setup.py --version)
 after_success:
-  - python travis_after_all.py
-  - export $(cat .to_export_back)
-  - |
-      if [ "$BUILD_LEADER" = "YES" ]; then
-        if [ "$BUILD_AGGREGATE_STATUS" = "others_succeeded" ]; then
-          echo "All jobs succeeded! PUBLISHING..."
-        else
-          echo "Some jobs failed"
-        fi
-      fi
-  - coveralls
-  - python setup.py sdist bdist_wheel
+- python travis_after_all.py
+- export $(cat .to_export_back)
+- |
+  if [ "$BUILD_LEADER" = "YES" ]; then
+    if [ "$BUILD_AGGREGATE_STATUS" = "others_succeeded" ]; then
+      echo "All jobs succeeded! PUBLISHING..."
+    else
+      echo "Some jobs failed"
+    fi
+  fi
+- coveralls
+  - travis_wait python setup.py sdist bdist_wheel
 after_failure:
-  - python travis_after_all.py
-  - export $(cat .to_export_back)
-  - |
-      if [ "$BUILD_LEADER" = "YES" ]; then
-        if [ "$BUILD_AGGREGATE_STATUS" = "others_failed" ]; then
-          echo "All jobs failed"
-        else
-          echo "Some jobs failed"
-        fi
-      fi
+- python travis_after_all.py
+- export $(cat .to_export_back)
+- |
+  if [ "$BUILD_LEADER" = "YES" ]; then
+    if [ "$BUILD_AGGREGATE_STATUS" = "others_failed" ]; then
+      echo "All jobs failed"
+    else
+      echo "Some jobs failed"
+    fi
+  fi
 after_script:
-  - echo leader=$BUILD_LEADER status=$BUILD_AGGREGATE_STATUS
+- echo leader=$BUILD_LEADER status=$BUILD_AGGREGATE_STATUS
 branches:
   only:
   - master
   - develop
+notifications:
+  email:
+  - [email protected]
 before_deploy:
-  - echo "before deploy..."
+- echo "before deploy..."
 deploy:
-  - provider: releases
-    api_key:
-      - secure: "gr9iOcQjdoAyUAim6FWKzJI9MBaJo9XKfGQGu7wdPXUFhg80Rp6GLJsowP+aU94NjXM1UQlVHDAy627WtjBlLH2SvmVEIIr7+UKBopBYuXG5jJ1m3wOZE+4f1Pqe9bqFc1DxgucqE8qF0sC24fIbNM2ToeyYrxrS6RoL2gRrX2I="
-    file: "dist/wstools-$PACKAGE_VERSION.tar.gz"
-    skip_cleanup: true
-    on:
-      branch: master
-      condition: "$BUILD_LEADER = YES"
-      tags: true
-  - provider: pypi
-    user: sorin
-    password:
-      secure: "E0cjANF7SLBdYrsnWLK8X/xWznqkF0JrP/DVfDazPzUYH6ynFeneyofzNJQPLTLsqe1eKXhuUJ/Sbl+RHFB0ySo/j/7NfYd/9pm8hpUkGCvR09IwtvMLgWKp3k10NWab03o2GOkSJSrLvZofyZBGR40wwu2O9uXPCb2rvucCGbw="
-    distributions: "sdist bdist_wheel"
-    on:
-      branch: master
-      condition: "$BUILD_LEADER = YES"
-  - provider: pypi
-    server: https://testpypi.python.org/pypi
-    user: sorins
-    password:
-      secure: "E0cjANF7SLBdYrsnWLK8X/xWznqkF0JrP/DVfDazPzUYH6ynFeneyofzNJQPLTLsqe1eKXhuUJ/Sbl+RHFB0ySo/j/7NfYd/9pm8hpUkGCvR09IwtvMLgWKp3k10NWab03o2GOkSJSrLvZofyZBGR40wwu2O9uXPCb2rvucCGbw="
-    distributions: "sdist bdist_wheel"
-    on:
-      branch: develop
-      tags: false
-      condition: "$BUILD_LEADER = YES"
+- provider: releases
+  api_key:
+    secure: gr9iOcQjdoAyUAim6FWKzJI9MBaJo9XKfGQGu7wdPXUFhg80Rp6GLJsowP+aU94NjXM1UQlVHDAy627WtjBlLH2SvmVEIIr7+UKBopBYuXG5jJ1m3wOZE+4f1Pqe9bqFc1DxgucqE8qF0sC24fIbNM2ToeyYrxrS6RoL2gRrX2I=
+  file:
+  - dist/$PACKAGE_NAME-$PACKAGE_VERSION*
+  skip_cleanup: true
+  on:
+    tags: false
+    branch: master
+    condition: "$BUILD_LEADER = YES"
+- provider: pypi
+  user: sorin
+  password:
+    secure: E0cjANF7SLBdYrsnWLK8X/xWznqkF0JrP/DVfDazPzUYH6ynFeneyofzNJQPLTLsqe1eKXhuUJ/Sbl+RHFB0ySo/j/7NfYd/9pm8hpUkGCvR09IwtvMLgWKp3k10NWab03o2GOkSJSrLvZofyZBGR40wwu2O9uXPCb2rvucCGbw=
+  distributions: sdist bdist_wheel
+  skip_cleanup: true
+  on:
+    tags: false
+    condition: "$BUILD_LEADER = YES"
+    branch: master
+- provider: pypi
+  server: https://testpypi.python.org/pypi
+  user: sorins
+  password:
+    secure: E0cjANF7SLBdYrsnWLK8X/xWznqkF0JrP/DVfDazPzUYH6ynFeneyofzNJQPLTLsqe1eKXhuUJ/Sbl+RHFB0ySo/j/7NfYd/9pm8hpUkGCvR09IwtvMLgWKp3k10NWab03o2GOkSJSrLvZofyZBGR40wwu2O9uXPCb2rvucCGbw=
+  distributions: sdist bdist_wheel
+  skip_cleanup: true
+  on:
+    tags: false
+    condition: "$BUILD_LEADER = YES"
+    branch: develop
+after_deploy:
+- echo "Now we only have tag the changeset and push..."
+- git tag $PACKAGE_VERSION -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER on $TRAVIS_BRANCH branch."
+- git push -q https://[email protected]/pycontribs/$PACKAGE_NAME $PACKAGE_VERSION
+addons:
+  artifacts:
+    debug: true
+    paths:
+    - dist/*
+    target_paths: $PACKAGE_NAME/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER-$TRAVIS_PYTHON_VERSION
+    working_dir: $TRAVIS_BUILD_DIR
+env:
+  global:
+  - secure: fuXwQL+KHQ96XkAFl2uQc8eK8dAjrgkup46tck/UGjVpdv1PT/yHmBKrvpFjDa50ueGbtBwTdKAwhyAmYuiZCk2IYHzdvBylCZBBji2FSpaTM59CVwgkVT6tx3HHO83X0mEX6ih9TJvZD5XhX+YUjopnseRXRq3ey3JZJXWN4RM=
+  - secure: "pGQGM5YmHvOgaKihOyzb3k6bdqLQnZQ2OXO9QrfXlXwtop3zvZQi80Q+01l230x2psDWlwvqWTknAjAt1w463fYXPwpoSvKVCsLSSbjrf2l56nrDqnoir+n0CBy288+eIdaGEfzcxDiuULeKjlg08zrqjcjLjW0bDbBrlTXsb5U="

.idea/modules.xml

@@ -0,0 +1,17 @@
+[pytest]
+norecursedirs = . .git .svn tox _build tmp* lib/third lib *.egg bin distutils build docs demo
+python_files = *.py
+addopts = -p no:xdist --ignore=setup.py --tb=long -rsxX -v --maxfail=10 tests
+# remove "--flake8" due to weir errors
+timeout=60
+# --maxfail=2 -n4
+# -n4              runs up to 4 parallel procs
+# --maxfail=2      fail fast, dude
+# --durations=3    report the top 3 longest tests
+
+# these are important for distributed testing, to speedup their execution we minimize what we sync
+rsyncdirs = . demo docs
+rsyncignore = .hg .git
+flake8-max-line-length = 99
+#flake8-ignore=D,D102
+flake8-ignore=D D102 H405

.travis.yml

@@ -1,7 +1,10 @@
-coverage
-coveralls
-flake8
-flake8-pep257>=1.0.5
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+py >= 1.4
+
+hacking
+
 pytest
 pytest-cov
-pytest-timeout

pytest.ini

@@ -12,26 +12,9 @@ all_files  = 1
 [upload_sphinx]
 upload-dir = docs/build/html
 
-[pytest]
-norecursedirs = . .git .svn tox _build tmp* lib/third lib *.egg bin distutils build docs demo
-python_files = *.py
-addopts = -p no:xdist --ignore=setup.py --tb=long -rsxX -v --maxfail=10 tests
-# remove "--flake8" due to weir errors
-timeout=60
-# --maxfail=2 -n4
-# -n4              runs up to 4 parallel procs
-# --maxfail=2      fail fast, dude
-# --durations=3    report the top 3 longest tests
-
-# these are important for distributed testing, to speedup their execution we minimize what we sync
-rsyncdirs = . demo docs
-rsyncignore = .hg .git
-flake8-max-line-length = 99
-#flake8-ignore=D,D102
-flake8-ignore=D D102
-
 [flake8]
+enable-extensions = H106,H203,H904
+exclude=build,.eggs,.tox
+ignore=D,E402,H405,H
 max-line-length=160
-exclude=build
 statistics=yes
-ignore=D,E402

requirements-dev.txt

@@ -5,20 +5,20 @@
 # See LBNLCopyright for copyright notice!
 ###########################################################################
 """Unittests."""
+import inspect
+import os
 import sys
 import unittest
-import os
-import inspect
 cmd_folder = os.path.abspath(os.path.join(os.path.split(inspect.getfile(
     inspect.currentframe()))[0], ".."))
 if cmd_folder not in sys.path:
     sys.path.insert(0, cmd_folder)
+from wstools.TimeoutSocket import TimeoutError  # noqa E402
 from wstools.Utility import DOM  # noqa E402
 from wstools.WSDLTools import WSDLReader  # noqa E402
-from wstools.TimeoutSocket import TimeoutError  # noqa E402
 try:
     import configparser
-except:
+except ImportError:
     from six.moves import configparser
 
 cwd = 'tests'
@@ -88,38 +88,38 @@ def test_all(self):
             print("connection timed out")
             sys.stdout.flush()
             return
-        except:
+        except Exception:
             self.path = self.path + ": load failed, unable to start"
             raise
 
         try:
             self.checkWSDLCollection('service', self.wsdl.services)
-        except:
+        except Exception:
             self.path = self.path + ": wsdl.services"
             raise
 
         try:
             self.checkWSDLCollection('message', self.wsdl.messages)
-        except:
+        except Exception:
             self.path = self.path + ": wsdl.messages"
             raise
 
         try:
             self.checkWSDLCollection('portType', self.wsdl.portTypes)
-        except:
+        except Exception:
             self.path = self.path + ": wsdl.portTypes"
             raise
 
         try:
             self.checkWSDLCollection('binding', self.wsdl.bindings)
-        except:
+        except Exception:
             self.path = self.path + ": wsdl.bindings"
             raise
 
         try:
             self.checkWSDLCollection('import', self.wsdl.imports,
                                      key='namespace')
-        except:
+        except Exception:
             self.path = self.path + ": wsdl.imports"
             raise
 
@@ -139,7 +139,7 @@ def test_all(self):
                     self.schemaAttributeGroupDeclarations(schema, snode)
                     self.schemaElementDeclarations(schema, snode)
                     self.schemaTypeDefinitions(schema, snode)
-        except:
+        except Exception:
             self.path = self.path + ": wsdl.types"
             raise
 

setup.cfg

@@ -4,8 +4,8 @@
 # Joshua R. Boverhof, David W. Robertson, LBNL
 # See LBNLCopyright for copyright notice!
 ###########################################################################
-import unittest
 import test_wsdl
+import unittest
 
 
 def makeTestSuite():

tests/test_wsdl.py

@@ -49,7 +49,7 @@ def connect(self, *addr):
         try:
             # Non-blocking mode
             sock.setblocking(0)
-            apply(sock.connect, addr)
+            sock.connect(*addr)
             sock.setblocking(timeout != 0)
             return 1
         except socket.error as why:
@@ -66,7 +66,7 @@ def connect(self, *addr):
             r, w, e = select.select([], [sock], [], timeout)
             if w:
                 try:
-                    apply(sock.connect, addr)
+                    sock.connect(*addr)
                     return 1
                 except socket.error as why:
                     if len(why.args) == 1:

tests/test_wstools_net.py

@@ -54,7 +54,7 @@ def __init__(self, inittuple=None):
         self.data = ()
         if inittuple is not None:
             # XXX should this accept an arbitrary sequence?
-            if type(inittuple) == type(self.data):
+            if isinstance(inittuple, tuple):
                 self.data = inittuple
             elif isinstance(inittuple, UserTuple):
                 # this results in
@@ -94,7 +94,7 @@ def __cast(self, other):
             return other
 
     def __cmp__(self, other):
-        return cmp(self.data, self.__cast(other))
+        return (self.data > self.__cast(other)) - (self.data < self.__cast(other))
 
     def __contains__(self, item):
         return item in self.data