Skip to content

Remove Python distutils imports #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Mirochill wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove Python distutils imports #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 68 additions & 3 deletions mininet/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,76 @@ def getincrementaldecoder():
return NullCodec

try:
import packaging.version # replacement for distutils.version
import packaging.version
StrictVersion = packaging.version.parse
except ImportError: # python2.7 lacks ModuleNotFoundError
import distutils.version # pylint: disable=deprecated-module
StrictVersion = distutils.version.StrictVersion
class StrictVersion( object ):
"Small version comparator fallback for simple numeric versions."

_regex = re.compile( r'^(\d+(?:\.\d+)*)(?:([a-zA-Z]+)(\d+)?)?$' )
_preRank = { 'a': 0, 'alpha': 0, 'b': 1, 'beta': 1,
'c': 2, 'pre': 2, 'preview': 2, 'rc': 2 }

def __init__( self, version ):
match = self._regex.match( str( version ) )
if not match:
raise ValueError( 'invalid version number %s' % version )
release, label, number = match.groups()
self.release = tuple( int( part ) for part in release.split( '.' ) )
if label:
self.prerelease = ( label.lower(), int( number or 0 ) )
else:
self.prerelease = None

@staticmethod
def _pad( left, right ):
"Pad release tuples to equal length."
length = max( len( left ), len( right ) )
return ( left + ( 0, ) * ( length - len( left ) ),
right + ( 0, ) * ( length - len( right ) ) )

@classmethod
def _preKey( cls, prerelease ):
"Return a comparable prerelease key."
if prerelease is None:
return ( 3, 0 )
label, number = prerelease
return ( cls._preRank.get( label, -1 ), number )

def _compare( self, other ):
"Compare two versions."
if not isinstance( other, StrictVersion ):
other = StrictVersion( other )
left, right = self._pad( self.release, other.release )
if left < right:
return -1
if left > right:
return 1
leftPre = self._preKey( self.prerelease )
rightPre = self._preKey( other.prerelease )
if leftPre < rightPre:
return -1
if leftPre > rightPre:
return 1
return 0

def __lt__( self, other ):
return self._compare( other ) < 0

def __le__( self, other ):
return self._compare( other ) <= 0

def __eq__( self, other ):
return self._compare( other ) == 0

def __ne__( self, other ):
return self._compare( other ) != 0

def __gt__( self, other ):
return self._compare( other ) > 0

def __ge__( self, other ):
return self._compare( other ) >= 0

try:
oldpexpect = None
Expand Down
10 changes: 9 additions & 1 deletion util/vm/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
from tempfile import mkdtemp, NamedTemporaryFile
from time import time, strftime, localtime
import argparse
from distutils.spawn import find_executable
import inspect
from traceback import print_exc

Expand All @@ -64,6 +63,15 @@
Prompt = '\$ ' # Shell prompt that pexpect will wait for


def find_executable( executable ):
"Return executable path from PATH or None."
for dirname in os.environ.get( 'PATH', '' ).split( os.pathsep ):
filename = path.join( dirname, executable )
if path.isfile( filename ) and os.access( filename, os.X_OK ):
return filename
return None


# URLs for Ubuntu .iso images

def serverURL( version, arch ):
Expand Down