From 1cac188e465ab7457fb0c5d20f96415b8e55d59f Mon Sep 17 00:00:00 2001 From: mdupuis Date: Wed, 9 Nov 2016 15:45:14 -0500 Subject: [PATCH] Fix PEP8 Add check for PEP8 in Travis Also upgrade to Python 3.5 --- .travis.yml | 13 +++++++++---- tox.ini | 2 +- virtualpdu/pdu/__init__.py | 2 +- virtualpdu/pdu/apc_rackpdu.py | 7 ++++--- virtualpdu/pdu/baytech_mrp27.py | 1 + virtualpdu/pdu/pysnmp_handler.py | 7 ++++--- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index a99eb04..f89e098 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,14 @@ sudo: required dist: trusty language: python -python: - - "2.7" - - "3.4" +matrix: + include: + - python: "2.7" + env: TOX_ENV=py27 + - python: "3.5" + env: TOX_ENV=py35 + - python: "3.5" + env: TOX_ENV=pep8 before_install: - sudo apt-get -qq update @@ -13,7 +18,7 @@ before_install: install: - pip install tox-travis -script: tox +script: tox -e $TOX_ENV deploy: provider: pypi diff --git a/tox.ini b/tox.ini index 682af18..ece685c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py34,py27,pep8 +envlist = py35,py27,pep8 skipsdist = True [testenv] diff --git a/virtualpdu/pdu/__init__.py b/virtualpdu/pdu/__init__.py index 7326551..6e237d6 100644 --- a/virtualpdu/pdu/__init__.py +++ b/virtualpdu/pdu/__init__.py @@ -121,7 +121,7 @@ class TraversableOidMapping(dict): set_oid.add(to) sorted_oids = sorted(set_oid) index = sorted_oids.index(to) - return sorted_oids[index+1] + return sorted_oids[index + 1] class PDU(object): diff --git a/virtualpdu/pdu/apc_rackpdu.py b/virtualpdu/pdu/apc_rackpdu.py index d1390d0..b3bb30f 100644 --- a/virtualpdu/pdu/apc_rackpdu.py +++ b/virtualpdu/pdu/apc_rackpdu.py @@ -100,11 +100,12 @@ class APCRackPDUOutletConfigIndex(PDUOutletFeature): class APCRackPDU(PDU): outlet_count = 8 outlet_index_start = 1 - outlet_features = [APCRackPDUOutletControl, APCRackPDUOutletName, APCRackPDUOutletConfigIndex, - APCRackPDUOutletState] + outlet_features = [APCRackPDUOutletControl, APCRackPDUOutletName, + APCRackPDUOutletConfigIndex, APCRackPDUOutletState] general_features = [ static_info(sysDescr, univ.OctetString("APC Rack PDU (virtualpdu)")), static_info(sysObjectID, univ.ObjectIdentifier(rPDU_sysObjectID)), static_info(rPDU_load_status_load, univ.Integer(amp_10)), - static_info(rPDU_load_status_load_state, univ.Integer(phase_load_normal)) + static_info(rPDU_load_status_load_state, + univ.Integer(phase_load_normal)) ] diff --git a/virtualpdu/pdu/baytech_mrp27.py b/virtualpdu/pdu/baytech_mrp27.py index dc9ba8b..b3a0739 100644 --- a/virtualpdu/pdu/baytech_mrp27.py +++ b/virtualpdu/pdu/baytech_mrp27.py @@ -13,6 +13,7 @@ # limitations under the License. from pyasn1.type import univ + from virtualpdu import core from virtualpdu.pdu import BasePDUOutletStates from virtualpdu.pdu import PDU diff --git a/virtualpdu/pdu/pysnmp_handler.py b/virtualpdu/pdu/pysnmp_handler.py index 43983a4..aae415a 100644 --- a/virtualpdu/pdu/pysnmp_handler.py +++ b/virtualpdu/pdu/pysnmp_handler.py @@ -74,12 +74,13 @@ class SNMPPDUHandler(object): for oid, val in protocol.apiPDU.getVarBinds(request_pdus): error_index += 1 try: - oid = TraversableOidMapping(self.pdu.oid_mapping).next(to=oid) + oid = TraversableOidMapping(self.pdu.oid_mapping)\ + .next(to=oid) val = self.pdu.oid_mapping[oid].value except (KeyError, IndexError): pending_errors.append( - (protocol.apiPDU.setNoSuchInstanceError, - error_index) + (protocol.apiPDU.setNoSuchInstanceError, + error_index) ) var_binds.append((oid, val)) elif request_pdus.isSameTypeWith(protocol.SetRequestPDU()):