@@ -662,13 +662,6 @@ def _version_compatible(left, right):
662662 right_star = version ("{}.*" .format (head ))
663663 return left .ge (right ) and left .eq (right_star )
664664
665- def _first_non_none (* args ):
666- for arg in args :
667- if arg != None :
668- return arg
669-
670- return None
671-
672665def _key (self , * , local , release_key = ("z" ,)):
673666 """This function returns a tuple that can be used in 'sorted' calls.
674667
@@ -685,15 +678,11 @@ def _key(self, *, local, release_key = ("z",)):
685678 # PEP440 release ordering: .devN, aN, bN, rcN, <no suffix>, .postN
686679 # We choose to first match the pre-release, then post release, then dev and
687680 # then stable
688- _first_non_none ( self .pre , self .post , self .dev , release_key ) ,
681+ self .pre or self .post or self .dev or release_key ,
689682 # PEP440 local versions go before post versions
690683 tuple ([(type (item ) == "int" , item ) for item in local ]),
691684 # PEP440 - pre-release ordering: .devN, <no suffix>, .postN
692- _first_non_none (
693- self .post ,
694- self .dev ,
695- release_key ,
696- ),
685+ self .post or self .dev or release_key ,
697686 # PEP440 - post release ordering: .devN, <no suffix>
698687 self .dev or release_key ,
699688 )
0 commit comments