enlightenment
/
econnman
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make compatible with python 3 

Patch is from D264, we were unable to use arc to commit this
so doing it manually.

Thanks for the contribution.
This commit is contained in:
Doug Newgard 2013-10-19 20:06:49 +03:00 committed by Kai Huuhko
parent 5e344beae4
commit a9f57df2b7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
econnman-bin.in
View File

@ -81,7 +81,7 @@ def dbus_variant_to_str(v):
def dbus_dict_to_str(d): def dbus_dict_to_str(d):
"Help debug by converting a dbus.Dictionary to a string in a shorter form." "Help debug by converting a dbus.Dictionary to a string in a shorter form."
s = [] s = []
for k, v in d.iteritems(): for k, v in d.items():
s.append("%s=%s" % (k, dbus_variant_to_str(v))) s.append("%s=%s" % (k, dbus_variant_to_str(v)))
return ", ".join(s) return ", ".join(s)
@ -253,7 +253,7 @@ class OfflineModeMonitor(object):
self.obj.on_del_add(self._deleted) self.obj.on_del_add(self._deleted)
def on_reply(properties): def on_reply(properties):
for name, value in properties.iteritems(): for name, value in properties.items():
log.debug("property %s: %s", name, value) log.debug("property %s: %s", name, value)
self._property_changed(name, value) self._property_changed(name, value)
@ -596,7 +596,7 @@ class ServicesList(object):
def _service_changed(self, path, properties): def _service_changed(self, path, properties):
log.debug("Changed %s: %s", path, dbus_dict_to_str(properties)) log.debug("Changed %s: %s", path, dbus_dict_to_str(properties))
d = self.services[path] d = self.services[path]
for k, v in properties.iteritems(): for k, v in properties.items():
d[k] = v d[k] = v
def _services_changed(self, changed, removed): def _services_changed(self, changed, removed):
@ -963,7 +963,7 @@ class ServiceView(ObjectView):
value = bool(value) value = bool(value)
self.immutable = value self.immutable = value
self.auto_connect.disabled = value self.auto_connect.disabled = value
for w in self.readwrite_list_widget.itervalues(): for w in self.readwrite_list_widget.values():
w.disabled = value w.disabled = value
self.ipv4_method.disabled = value self.ipv4_method.disabled = value
self.ipv4_address.disabled = value self.ipv4_address.disabled = value
@ -1155,7 +1155,7 @@ class ServiceView(ObjectView):
conf = self.ipv4_properties["IPv4.Configuration"] conf = self.ipv4_properties["IPv4.Configuration"]
changed = [] changed = []
for k, v in new.iteritems(): for k, v in new.items():
if conf.get(k) != v: if conf.get(k) != v:
changed.append(k) changed.append(k)
log.debug("Changed IPv4: %s", ", ".join(changed)) log.debug("Changed IPv4: %s", ", ".join(changed))
@ -1347,7 +1347,7 @@ class Agent(dbus.service.Object):
def on_clicked(obj): def on_clicked(obj):
response = {} response = {}
keys = [] keys = []
for name, en in widgets.iteritems(): for name, en in widgets.items():
conv = self.request_type_conv.get(name, dbus.String) conv = self.request_type_conv.get(name, dbus.String)
v = conv(en.text) v = conv(en.text)
if v: if v:
@ -1394,7 +1394,7 @@ class Agent(dbus.service.Object):
bx.pack_end(lb) bx.pack_end(lb)
widgets = {} widgets = {}
for name, desc in fields.iteritems(): for name, desc in fields.items():
decos = "" decos = ""
t = desc.get("Type") t = desc.get("Type")
if t and t != "informational": if t and t != "informational":