Merge pull request #3 from networkops/agavrik

ios error handling enhancements
verisign · Apr 25, 2016 · 95d2e96 · 95d2e96
2 parents b8b7559 + 2bd46df
commit 95d2e96
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cling/__init__.py b/cling/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*- vim:fileencoding=utf-8:
 
-__version__ = '2.3.1'
+__version__ = '2.3.2'
 
 __all__ = ['Cling', 'Error', 'Reactor']
 

diff --git a/cling/cli.py b/cling/cli.py
@@ -105,7 +105,7 @@ def __init__(self,
                  snmp_version=2,
                  pexpect_maxread=64000,
                  pexpect_searchwindowsize=5,
-                 error_lookup_buffer=100,
+                 error_lookup_buffer=256,
                  max_login_attempts=2,
                  failed_login_retry_pause=3,
                  pub_key_auth=False,

diff --git a/cling/error_handler/ios.py b/cling/error_handler/ios.py
@@ -8,11 +8,11 @@
 class IosErrorHandler(DefaultErrorHandler):
 
     _ERROR_MATCHES = [
-                   re.compile(r'%\s+invalid', flags=re.I),
-                   re.compile(r'%\s+unknown', flags=re.I),
-                   re.compile(r'%\s+ambiguous', flags=re.I),
-                   re.compile(r'%\s+incomplete', flags=re.I),
-                   re.compile(r'authorization failed', flags=re.I),
+                   re.compile(r'^%.+invalid', flags=re.I|re.M),
+                   re.compile(r'^%.+unknown', flags=re.I|re.M),
+                   re.compile(r'^%.+ambiguous', flags=re.I|re.M),
+                   re.compile(r'^%.+incomplete', flags=re.I|re.M),
+                   re.compile(r'^%.+failed', flags=re.I|re.M),
                    ]
 
     def __init__(self, personality):