[Mesa-dev] [PATCH v2 11/26] python: Fix rich comparisons

[Dylan Baker]

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

Quoting Mathieu Bridon (2018-07-17 13:57:39)
> Python 3 doesn't call objects __cmp__() methods any more to compare
> them. Instead, it requires implementing the rich comparison methods
> explicitly: __eq__(), __ne(), __lt__(), __le__(), __gt__() and __ge__().
> 
> Fortunately Python 2 also supports those.
> 
> This commit only implements the comparison methods which are actually
> used by the build scripts.
> 
> Signed-off-by: Mathieu Bridon <bochecha at daitauha.fr>
> ---
>  src/amd/vulkan/radv_extensions.py  |  5 +++--
>  src/intel/vulkan/anv_extensions.py |  5 +++--
>  src/mapi/mapi_abi.py               | 15 +++++++--------
>  3 files changed, 13 insertions(+), 12 deletions(-)
> 
> diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py
> index a0f1038110..55e14b811a 100644
> --- a/src/amd/vulkan/radv_extensions.py
> +++ b/src/amd/vulkan/radv_extensions.py
> @@ -143,14 +143,15 @@ class VkVersion:
>          patch = self.patch if self.patch is not None else 0
>          return (self.major << 22) | (self.minor << 12) | patch
>  
> -    def __cmp__(self, other):
> +    def __gt__(self, other):
>          # If only one of them has a patch version, "ignore" it by making
>          # other's patch version match self.
>          if (self.patch is None) != (other.patch is None):
>              other = copy.copy(other)
>              other.patch = self.patch
>  
> -        return self.__int_ver().__cmp__(other.__int_ver())
> +        return self.__int_ver() > other.__int_ver()
> +
>  
>  MAX_API_VERSION = VkVersion(MAX_API_VERSION)
>  
> diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py
> index 0f99f58ecb..56b1ebf96d 100644
> --- a/src/intel/vulkan/anv_extensions.py
> +++ b/src/intel/vulkan/anv_extensions.py
> @@ -155,14 +155,15 @@ class VkVersion:
>          patch = self.patch if self.patch is not None else 0
>          return (self.major << 22) | (self.minor << 12) | patch
>  
> -    def __cmp__(self, other):
> +    def __gt__(self, other):
>          # If only one of them has a patch version, "ignore" it by making
>          # other's patch version match self.
>          if (self.patch is None) != (other.patch is None):
>              other = copy.copy(other)
>              other.patch = self.patch
>  
> -        return self.__int_ver().__cmp__(other.__int_ver())
> +        return self.__int_ver() > other.__int_ver()
> +
>  
>  
>  MAX_API_VERSION = VkVersion('0.0.0')
> diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py
> index be1d15d922..e4ce2b6caf 100644
> --- a/src/mapi/mapi_abi.py
> +++ b/src/mapi/mapi_abi.py
> @@ -121,19 +121,18 @@ class ABIEntry(object):
>      def __str__(self):
>          return self.c_prototype()
>  
> -    def __cmp__(self, other):
> +    def __lt__(self, other):
>          # compare slot, alias, and then name
> -        res = cmp(self.slot, other.slot)
> -        if not res:
> +        if self.slot == other.slot:
>              if not self.alias:
> -                res = -1
> +                return True
>              elif not other.alias:
> -                res = 1
> +                return False
>  
> -            if not res:
> -                res = cmp(self.name, other.name)
> +            return self.name < other.name
> +
> +        return self.slot < other.slot
>  
> -        return res
>  
>  def abi_parse_xml(xml):
>      """Parse a GLAPI XML file for ABI entries."""
> -- 
> 2.17.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180807/a2db4a73/attachment.sig>