Skip to content

strip whitespace from lines earlier in the processing sequence #9

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

Merged
merged 1 commit into from
Jan 22, 2018
Merged

strip whitespace from lines earlier in the processing sequence #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pyEXOS/exos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ def load_candidate_config(self, filename=None, config=None):
else:
self.candidate_config = config.splitlines()

self.candidate_config = [line.strip() for line in self.candidate_config]

def commit_config(self):
"""
Commit candidate_config to the device.
Expand Down Expand Up @@ -157,6 +159,7 @@ def get_running_config(self):
try:
output = self.device.send_command('show configuration', delay_factor=20)
self.running_config = output.splitlines()
self.running_config = [line.strip() for line in self.running_config]
except (ValueError, IndexError, IOError):
raise

Expand Down Expand Up @@ -202,8 +205,8 @@ def compare_replace_config(self):
# make sure we have the running_config
self.get_running_config()

replace_diff = difflib.unified_diff([x.strip() for x in self.running_config],
[x.strip() for x in self.candidate_config],
replace_diff = difflib.unified_diff(self.running_config,
self.candidate_config,
fromfile='running_config.conf',
tofile='candidate_config.conf',
lineterm='')
Expand Down