Skip to content
Snippets Groups Projects
Commit 526728af authored by jkerdreu's avatar jkerdreu
Browse files

Fix sort list issue in Py3


git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/fork@1647 b32b6428-25c9-4566-ad07-03861ab6144f
parent 767525cf
No related branches found
No related tags found
No related merge requests found
......@@ -29,24 +29,26 @@ class Device:
self.last_alive = int(time.time())
self.next_alive = self.last_alive + value
"""
def __cmp__(self,other):
if (self.devtype == other.devtype):
if self.address > other.address:
return 1
else:
return -1
if (self.devtype > other.devtype):
return 1
if (self.devtype < other.devtype):
return -1
return 0
"""
def dump(self):
print("*** %s %s **" % (self.address,self.devtype))
print(" Description : %s" % self.description)
print(" Attributes : %s" % self.attributes)
print()
def sort_dev_helper(devA, devB):
if (devA.devtype == devB.devtype):
if devA.address > devB.address:
return 1
else:
return -1
if (devA.devtype > devB.devtype):
return 1
if (devA.devtype < devB.devtype):
return -1
return 0
class Devices:
......@@ -63,9 +65,9 @@ class Devices:
def get(self):
if not self.__list_cache:
print("Refresh cache")
l = self.__devs.values()
l.sort(sort_dev_helper)
self.__list_cache = l
res = list(self.__devs.values())
res.sort(key = lambda d: d.devtype)
self.__list_cache = res
return self.__list_cache
def get_with_addr(self, addr):
......@@ -104,7 +106,6 @@ class Devices:
def __contains__(self,key):
return key in self.__devs
def auto_wash(self):
now = int(time.time())
for dev in self.get():
......@@ -113,6 +114,9 @@ class Devices:
del self.__devs[dev.address]
self.__list_cache = None
def display(self):
for d in self.get():
print("%s %s" % (d.address,d.devtype))
class Monitor:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment