Skip to content

[configlet][portconfig] Remove calls to dict.has_key() which is not available in Python 3 #1247

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
jleveque merged 1 commit into from
Nov 18, 2020
Merged

[configlet][portconfig] Remove calls to dict.has_key() which is not available in Python 3 #1247

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions scripts/configlet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def db_update(t, k, lst):
if tuple_k in ct_keys:
data = db.get_entry(t, k)
for i in lst:
if not data.has_key(i) or data[i] != lst[i]:
if i not in data or data[i] != lst[i]:
to_upd = True
break
else:
Expand All @@ -116,7 +116,7 @@ def db_delete_fields(t, k, lst):
to_set = False
data = db.get_entry(t, k)
for i in lst:
if data.has_key(i):
if i in data:
data.pop(i)
to_set = True

Expand Down
4 changes: 2 additions & 2 deletions scripts/portconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ class portconfig(object):

# check whether table for this port exists
port_tables = self.db.get_table(PORT_TABLE_NAME)
if not port_tables.has_key(port):
if port not in port_tables:
raise Exception("Invalid port specified")

def list_params(self, port):
# chack whether table for this port exists
port_tables = self.db.get_table(PORT_TABLE_NAME)
if port_tables.has_key(port):
if port in port_tables:
print(port_tables[port])

def set_speed(self, port, speed):
Expand Down