jyapayne/vimspector
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #119 from puremourning/drop-py2

Browse source 
Drop python 2 support in installer
This commit is contained in:
mergify[bot] 2020-02-15 11:58:12 +00:00 • committed by GitHub
commit 86afe89d63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
install_gadget.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# vimspector - A multi-language debugging system for Vim # vimspector - A multi-language debugging system for Vim
# Copyright 2019 Ben Jackson # Copyright 2019 Ben Jackson
@ -15,11 +15,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
try: import sys
import urllib.request as urllib2
except ImportError:
import urllib2
if sys.version_info.major < 3:
exit( "Sorry, you need to be running this script with python3 or later" )
from urllib import request
import argparse import argparse
import contextlib import contextlib
import os import os
@ -31,16 +32,11 @@ import subprocess
import traceback import traceback
import tarfile import tarfile
import hashlib import hashlib
import sys
import json import json
import functools import functools
import time import time
import ssl import ssl
import io
try:
from io import BytesIO # for Python 3
except ImportError:
from BytesIO import BytesIO
# Include vimspector source, for utils # Include vimspector source, for utils
sys.path.insert( 1, os.path.join( os.path.dirname( __file__ ), sys.path.insert( 1, os.path.join( os.path.dirname( __file__ ),
@ -522,7 +518,7 @@ def WithRetry( f ):
@WithRetry @WithRetry
def UrlOpen( *args, **kwargs ): def UrlOpen( *args, **kwargs ):
return urllib2.urlopen( *args, **kwargs ) return request.urlopen( *args, **kwargs )
def DownloadFileTo( url, def DownloadFileTo( url,
@ -550,7 +546,7 @@ def DownloadFileTo( url,
print( "Removing existing {}".format( file_path ) ) print( "Removing existing {}".format( file_path ) )
os.remove( file_path ) os.remove( file_path )
r = urllib2.Request( url, headers = { 'User-Agent': 'Vimspector' } ) r = request.Request( url, headers = { 'User-Agent': 'Vimspector' } )
print( "Downloading {} to {}/{}".format( url, destination, file_name ) ) print( "Downloading {} to {}/{}".format( url, destination, file_name ) )
@ -627,7 +623,7 @@ def ExtractZipTo( file_path, destination, format ):
with gzip.open( file_path, 'rb' ) as f: with gzip.open( file_path, 'rb' ) as f:
file_contents = f.read() file_contents = f.read()
with ModePreservingZipFile( BytesIO( file_contents ) ) as f: with ModePreservingZipFile( io.BytesIO( file_contents ) ) as f:
f.extractall( path = destination ) f.extractall( path = destination )
elif format == 'tar': elif format == 'tar':