Merge 868a2c9 into fc5debc

Juniper · Feb 9, 2021 · 6de57ed · 6de57ed
2 parents fc5debc + 868a2c9
commit 6de57ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,11 +16,13 @@ matrix:
           python: 3.7
           before_install:
             - choco install python3 --version=3.7.4
+            - choco install openssl=1.1.1.900 
             - pip install ntc_templates==1.4.1
             - pip install textfsm==0.4.1
           env:
             - PATH=/c/Python37:/c/Python37/Scripts:$PATH
             - TRAVIS_PYTHON_VERSION=3.7
+            - CRYPTOGRAPHY_DONT_BUILD_RUST=1
 addons:
   apt:
     packages:

diff --git a/lib/jnpr/junos/utils/config.py b/lib/jnpr/junos/utils/config.py
@@ -260,6 +260,10 @@ def diff(self, rb_id=0, ignore_warning=False, use_fast_diff=False):
             else:
                 raise
 
+        # Check return type is an etree Element, if not return None for no changes
+        if not type(rsp) == etree._Element:
+            return None
+
         diff_txt = rsp.find("configuration-output").text
         return None if diff_txt == "\n" else diff_txt