Merge branch 'master' into HEAD

Author: Aaron-MJohn

lib/jnpr/junos/cfg/phyport/classic.py

@@ -8,7 +8,6 @@
 
 
 class PhyPortClassic(PhyPortBase):
-
     # -----------------------------------------------------------------------
     # XML readers
     # -----------------------------------------------------------------------

lib/jnpr/junos/cfg/phyport/switch.py

@@ -8,7 +8,6 @@
 
 
 class PhyPortSwitch(PhyPortBase):
-
     PORT_SPEED = {
         "auto": "auto-negotiation",
         "10m": "ethernet-10m",

lib/jnpr/junos/cfg/resource.py

@@ -13,7 +13,6 @@
 
 
 class Resource(object):
-
     PROPERTIES = [P_JUNOS_EXISTS, P_JUNOS_ACTIVE]
 
     def __init__(self, junos, namevar=None, **kvargs):

lib/jnpr/junos/factory/cfgtable.py

@@ -9,7 +9,6 @@
 
 
 class CfgTable(Table):
-
     __isfrozen = False
 
     # -----------------------------------------------------------------------

lib/jnpr/junos/factory/factory_loader.py

@@ -389,7 +389,6 @@ def _sortitems(self):
                 self._item_views.append(k)
 
     def load(self, catalog_dict, envrion={}):
-
         # load the yaml data and extract the item names.  these names will
         # become the new class definitions
 

lib/jnpr/junos/factory/optable.py

@@ -14,7 +14,6 @@
 
 
 class OpTable(Table):
-
     # -------------------------------------------------------------------------
     # PUBLIC METHODS
     # -------------------------------------------------------------------------

lib/jnpr/junos/facts/__example.py

@@ -16,6 +16,7 @@
 # An import for each fact file must be present in
 # lib/jnpr/junos/facts/__init__.py
 
+
 # The file must include a provide_facts() function
 # The provide_facts() function must return a dictionary. The keys of the
 # dictionary are each fact that is handled/returned by this module. The value

lib/jnpr/junos/facts/__init__.py

@@ -66,7 +66,7 @@ def _build_fact_callbacks_and_doc_strings():
     """
     callbacks = {}
     doc_strings = {}
-    for (name, module) in sys.modules.items():
+    for name, module in sys.modules.items():
         if name.startswith("jnpr.junos.facts.") and module is not None:
             new_doc_strings = module.provides_facts()
             for key in new_doc_strings:

lib/jnpr/junos/ofacts/personality.py

@@ -2,7 +2,6 @@
 
 
 def facts_personality(junos, facts):
-
     model = facts["model"]
 
     if model != "Virtual Chassis":

lib/jnpr/junos/ofacts/routing_engines.py

@@ -17,7 +17,6 @@ def _get_vc_status(dev, facts):
 
 
 def facts_routing_engines(junos, facts):
-
     re_facts = ["mastership-state", "status", "model", "up-time", "last-reboot-reason"]
 
     master = []

lib/jnpr/junos/ofacts/swver.py

@@ -64,7 +64,6 @@ def facts_software_version(junos, facts):
             facts["hostname"] = x_swver.findtext(".//software-information/host-name")
 
         for re_sw in x_swver.xpath(".//software-information"):
-
             re_name = re_sw.xpath("preceding-sibling::re-name")[0].text
 
             # handle the cases where the "RE name" could be things like

lib/jnpr/junos/rpcmeta.py

@@ -6,7 +6,6 @@
 
 
 class _RpcMetaExec(object):
-
     # -----------------------------------------------------------------------
     # CONSTRUCTOR
     # -----------------------------------------------------------------------

lib/jnpr/junos/utils/config.py

@@ -824,7 +824,6 @@ def __init__(self, dev, mode=None, **kwargs):
         Util.__init__(self, dev=dev)
 
     def __enter__(self):
-
         # defining separate functions for each mode so that can be
         # changed/edited as per the need of corresponding rpc call.
         def _open_configuration_private():

lib/jnpr/junos/utils/scp.py

@@ -59,7 +59,6 @@ def _progress(self, report):
         print(self._junos.hostname + ": " + report)
 
     def _scp_progress(self, _path, _total, _xfrd):
-
         # calculate current percentage xferd
         pct = int(float(_xfrd) / float(_total) * 100)
 

setup.py

@@ -24,7 +24,7 @@
         "jnpr.junos.cfgro": ["*.yml"],
         "jnpr.junos.resources": ["*.yml"],
     },
-    python_requires=">=3.*, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    python_requires=">=3.5, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
     install_requires=install_reqs,
     classifiers=[
         "Development Status :: 5 - Production/Stable",