Ticket #11185: lsusb.py.diff

lsusb.py

@@ -12 +12 @@
 
 import os, sys, re, getopt
 
-# from __future__ import print_function
-
 # Global options
 showint = False
 showhubint = False
@@ -53 +51 @@
                 self.desc = str
         def __repr__(self):
                 return self.desc
-        def __cmp__(self, oth):
-                # Works only on 64bit systems:
-                #return self.pclass*0x10000+self.subclass*0x100+self.proto \
-                #       - oth.pclass*0x10000-oth.subclass*0x100-oth.proto
-                if self.pclass != oth.pclass:
-                        return self.pclass - oth.pclass
-                if self.subclass != oth.subclass:
-                        return self.subclass - oth.subclass
-                return self.proto - oth.proto
+
+        def __lt__(self, oth):
+                return (self.pclass, self.subclass, self.proto) < \
+                                (oth.pclass, oth.subclass, oth.proto)
+        def __eq__(self, oth):
+                return (self.pclass, self.subclass, self.proto) == \
+                                (oth.pclass, oth.subclass, oth.proto)
 
 class UsbVendor:
         "Container for USB Vendors"
@@ -70 +66 @@
                 self.vname = vname
         def __repr__(self):
                 return self.vname
-        def __cmp__(self, oth):
-                return self.vid - oth.vid
+        def __lt__(self, oth):
+                return self.vid < oth.vid
+        def __eq__(self, oth):
+                return self.vid == oth.vid
 
 class UsbProduct:
         "Container for USB VID:PID devices"
@@ -81 +79 @@
                 self.pname = pname
         def __repr__(self):
                 return self.pname
-        def __cmp__(self, oth):
-                # Works only on 64bit systems:
-                # return self.vid*0x10000 + self.pid \
-                #       - oth.vid*0x10000 - oth.pid
-                if self.vid != oth.vid:
-                        return self.vid - oth.vid
-                return self.pid - oth.pid
+        def __lt__(self, oth):
+                return (self.vid, self.pid) < (oth.vid, oth.pid)
+        def __eq__(self, oth):
+                return (self.vid, self.pid) == (oth.vid, oth.pid)
 
 usbvendors = []
 usbproducts = []
@@ -107 +102 @@
         mode = 0
         strg = ""
         cstrg = ""
-        for ln in file(usbids, "r").readlines():
+        for ln in open(usbids, "r", errors="ignore"):
                 if ln[0] == '#':
                         continue
                 ln = ln.rstrip('\n')
@@ -146 +141 @@
 
 def bin_search(first, last, item, list):
         "binary search on list, returns -1 on fail, match idx otherwise, recursive"
-        #print "bin_search(%i,%i)" % (first, last)
         if first == last:
                 return -1
         if first == last-1:
@@ -233 +227 @@
         for nm in devlst:
                 dir = prefix + usbname
                 prep = ""
-                #print nm
                 idx = nm.find('/')
                 if idx != -1:
                         prep = nm[:idx+1]
@@ -404 +397 @@
                 try:
                         self.nointerfaces = int(readattr(fname, "bNumInterfaces"))
                 except:
-                        #print "ERROR: %s/bNumInterfaces = %s" % (fname,
-                        #               readattr(fname, "bNumInterfaces"))a
                         self.nointerfaces = 0
                 try:
                         self.driver = readlink(fname, "driver")
@@ -421 +412 @@
                 for dirent in os.listdir(prefix + self.fname):
                         if not dirent[0:1].isdigit():
                                 continue
-                        #print dirent
                         if os.access(prefix + dirent + "/bInterfaceClass", os.R_OK):
                                 iface = UsbInterface(self, self.level+1)
                                 iface.read(dirent)
@@ -532 +522 @@
 def read_usb():
         "Read toplevel USB entries and print"
         for dirent in os.listdir(prefix):
-                #print dirent,
                 if not dirent[0:3] == "usb":
                         continue
                 usbdev = UsbDevice(None, 0)
@@ -590 +579 @@
                 fix_usbclass()
         except:
                 print(" WARNING: Failure to read usb.ids", file=sys.stderr)
-                #print >>sys.stderr, sys.exc_info()
         read_usb()
 
 # Entry point