Skip to content

Commit

Permalink
Merge 3a1b7d2 into 9b0d306
Browse files Browse the repository at this point in the history
  • Loading branch information
mirceaulinic committed Jul 9, 2019
2 parents 9b0d306 + 3a1b7d2 commit e2a6967
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions napalm/junos/junos.py
Expand Up @@ -153,7 +153,7 @@ def _unlock(self):
self.device.cu.unlock()
self.locked = False
except JnrpUnlockError as jue:
raise UnlockError(jue.messsage)
raise UnlockError(jue)

def _rpc(self, get, child=None, **kwargs):
"""
Expand Down Expand Up @@ -818,7 +818,7 @@ def get_lldp_neighbors_detail(self, interface=""):
interface_args = {interface_variable: interface}
lldp_table.get(**interface_args)
except RpcError as e:
if "syntax error" in e.message:
if "syntax error" in str(e):
# Looks like we need to call a different RPC on this device
# Switch to the alternate style
lldp_table.GET_RPC = alt_rpc
Expand Down Expand Up @@ -1571,7 +1571,7 @@ def get_mac_address_table(self):
except RpcError as e:
# Device hasn't got it's l2 subsystem running
# Don't error but just return an empty result
if "l2-learning subsystem" in e.message:
if "l2-learning subsystem" in str(e):
return []
else:
raise
Expand Down

0 comments on commit e2a6967

Please sign in to comment.