Merge pull request #165 from mcarlton00/remove-remoteaddress

Move the RemoteAddress check
This commit is contained in:
Abby 2019-12-17 00:54:39 +00:00 committed by GitHub
commit 412f113b83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -404,15 +404,15 @@ def get_credentials():
# Migration for #145
# TODO: CLEANUP for 1.0.0 release
for server in credentials['Servers']:
# Functionality removed in #60
if 'RemoteAddress' in server:
del server['RemoteAddress']
if 'ManualAddress' in server:
server['address'] = server['ManualAddress']
del server['ManualAddress']
# If manual is present, local should always be here, but better to be safe
if 'LocalAddress' in server:
del server['LocalAddress']
# Functionality removed in #60
if 'RemoteAddress' in server:
del server['RemoteAddress']
elif 'LocalAddress' in server:
server['address'] = server['LocalAddress']
del server['LocalAddress']