Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

testing textfsm installed as module #1292

Merged
merged 3 commits into from
Jul 19, 2019
Merged

testing textfsm installed as module #1292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ca491c
testing textfsm installed as module
Jul 19, 2019
135b052
change imports to ensure this works w/ windows
Jul 19, 2019
5ca42f5
appease the formatting overlords!
Jul 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion netmiko/_textfsm/_clitable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@
import os
import re
import threading
import copyable_regex_object

try:
# TextFSM >= 1.0 (new package structure)
from textfsm import copyable_regex_object
except ImportError:
# TextFSM <= 0.4.1
import copyable_regex_object
import textfsm
from netmiko._textfsm import _texttable as texttable

Expand Down
2 changes: 1 addition & 1 deletion netmiko/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import io
import os
import serial.tools.list_ports
from netmiko.py23_compat import text_type
from netmiko._textfsm import _clitable as clitable
from netmiko._textfsm._clitable import CliTableError
from netmiko.py23_compat import text_type

try:
from genie.conf.base import Device
Expand Down