2
0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00

python: Use getattr() and setattr() instead of __dict__.

This leaves one use of __dict__ used for iterating through attributes.
I could use dir() instead, but I was put off by this note in its
documentation in the Python Library Reference:

    Because dir() is supplied primarily as a convenience for use at an
    interactive prompt, it tries to supply an interesting set of names more
    than it tries to supply a rigorously or consistently defined set of names,
    and its detailed behavior may change across releases.  For example,
    metaclass attributes are not in the result list when the argument is a
    class.

Suggested-by: Reid Price <reid@nicira.com>
This commit is contained in:
Ben Pfaff
2011-08-22 14:31:18 -07:00
parent 57d6a4c71b
commit 523a3bc773
3 changed files with 5 additions and 6 deletions

View File

@@ -266,8 +266,7 @@ def _should_restart(status):
if os.WIFSIGNALED(status):
for signame in ("SIGABRT", "SIGALRM", "SIGBUS", "SIGFPE", "SIGILL",
"SIGPIPE", "SIGSEGV", "SIGXCPU", "SIGXFSZ"):
if (signame in signal.__dict__ and
os.WTERMSIG(status) == signal.__dict__[signame]):
if os.WTERMSIG(status) == getattr(signal, signame, None):
return True
return False

View File

@@ -271,8 +271,8 @@ class Idl:
% (column_name, table_name, e))
continue
if datum != row.__dict__[column_name]:
row.__dict__[column_name] = datum
if datum != getattr(row, column_name):
setattr(row, column_name, datum)
changed = True
else:
# Didn't really change but the OVSDB monitor protocol always
@@ -296,7 +296,7 @@ class Idl:
pass
row = self.data[table.name][uuid] = Row()
for column in table.columns.itervalues():
row.__dict__[column.name] = ovs.db.data.Datum.default(column.type)
setattr(row, column.name, ovs.db.data.Datum.default(column.type))
return row
def force_reconnect(self):

View File

@@ -18,7 +18,7 @@ import signal
def _signal_status_msg(type, signr):
s = "%s by signal %d" % (type, signr)
for name in signal.__dict__:
if name.startswith("SIG") and signal.__dict__[name] == signr:
if name.startswith("SIG") and getattr(signal, name) == signr:
return "%s (%s)" % (s, name)
return s