From: Kyle Manna <kyle@kylemanna.com>
Date: Sat, 19 Sep 2015 22:03:13 +0000 (-0700)
Subject: generator: Remove cmp() to work with Python3
X-Git-Tag: 5.0.2~186^2~111^2~4
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=0d7ef5f936afc32bfe0aaec8b92667d4c3a026a0;p=apps%2Fagl-service-can-low-level.git

generator: Remove cmp() to work with Python3

* Python3 ignores cmp() and __cmp__() and only needs __lt__() for
  sorting.  Delete and update as appropriate.
* Ref: https://docs.python.org/3.0/whatsnew/3.0.html#ordering-comparisons
---

diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py
index 240fa15f..f7d43221 100755
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -314,8 +314,8 @@ class Field:
         else:
             raise NotImplementedError(desc.type)
         
-    def __cmp__(self, other):
-        return cmp(self.tag, other.tag)
+    def __lt__(self, other):
+        return self.tag < other.tag
     
     def __str__(self):
         result = ''
@@ -661,9 +661,6 @@ class OneOf(Field):
         # Sort by the lowest tag number inside union
         self.tag = min([f.tag for f in self.fields])
 
-    def __cmp__(self, other):
-        return cmp(self.tag, other.tag)
-
     def __str__(self):
         result = ''
         if self.fields: