Skip to content

Commit e8e8eaa

Browse files
committed
- version 0.9.2.25
- droping python 2 - PyRadio will only run on python 3 - fixing #228
1 parent da5b99c commit e8e8eaa

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

pyradio/install.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,6 @@ class PythonExecutable(object):
653653

654654
def __init__(
655655
self,
656-
requested_python_version,
657656
terminate_if_not_found=False):
658657
''' Parameters
659658
==========
@@ -664,18 +663,16 @@ def __init__(
664663
If True, the program will terminate if python
665664
is not found (default is False)
666665
'''
667-
self.requested_python_version = requested_python_version
668666
self._terminate_if_not_found = terminate_if_not_found
669667
if not platform.system().lower().startswith('win'):
670668
self._check_if_is_debian_based()
671669
self._get_pythons()
672670

673671
def __str__(self):
674-
return 'Is Debian: {0}\nPython: {1}, {2}\nRequested version: {3}'.format(
672+
return 'Is Debian: {0}\nPython: {1}, {2}'.format(
675673
self.is_debian,
676674
self._python[0],
677675
self._python[1],
678-
self.requested_python_version
679676
)
680677

681678
@property
@@ -1157,7 +1154,10 @@ def _prompt_sudo(self):
11571154
def _download_file(self, url, filename):
11581155
print(' url: "{}"'.format(url))
11591156
print(' filename: "{}"'.format(filename))
1160-
if os.path.exists(filename):
1157+
if os.path.exists(filename) and not (
1158+
filename.endswith('-master.zip') or \
1159+
filename.endswith('-devel.zip')
1160+
):
11611161
print(' [magenta]** file found in cache![/magenta]')
11621162
else:
11631163
try:
@@ -1397,7 +1397,6 @@ def _do_it(self, mode='update'):
13971397
VERSION = PyRadioInstallPyReleaseVersion
13981398

13991399
if args.uninstall:
1400-
self._get_cache = False
14011400
if platform.system().lower().startswith('win'):
14021401
''' ok, create BAT file on Windows'''
14031402
uni = PyRadioUpdateOnWindows(package=package)

0 commit comments

Comments
 (0)