gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 20:38:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix some execution paths in setup.py for Python 3

Browse Source 
Mostly adds additionally thrown Exceptions and str vs bytes
conversions.
This commit is contained in:
Axel Beckert
2019-09-11 01:13:04 +02:00
parent 15ca072eed
commit c4ba09c196
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
setup.py
View File

@@ -231,36 +231,36 @@ class configure(Command):
pmtemp = subprocess.Popen(["pkg-config", "--variable=pm_sleephooks", pmtemp = subprocess.Popen(["pkg-config", "--variable=pm_sleephooks",
"pm-utils"], stdout=subprocess.PIPE) "pm-utils"], stdout=subprocess.PIPE)
returncode = pmtemp.wait() # let it finish, and get the exit code returncode = pmtemp.wait() # let it finish, and get the exit code
pmutils_candidate = pmtemp.stdout.readline().strip() # read stdout pmutils_candidate = str(pmtemp.stdout.readline().strip()) # read stdout
if len(pmutils_candidate) == 0 or returncode != 0 or \ if len(pmutils_candidate) == 0 or returncode != 0 or \
not os.path.isabs(pmutils_candidate): not os.path.isabs(pmutils_candidate):
raise ValueError raise ValueError
else: else:
self.pmutils = pmutils_candidate self.pmutils = pmutils_candidate
except (OSError, ValueError): except (OSError, ValueError, FileNotFoundError):
pass # use our default pass # use our default
try: try:
kdetemp = subprocess.Popen(["kde-config","--prefix"], stdout=subprocess.PIPE) kdetemp = subprocess.Popen(["kde-config","--prefix"], stdout=subprocess.PIPE)
returncode = kdetemp.wait() # let it finish, and get the exit code returncode = kdetemp.wait() # let it finish, and get the exit code
kdedir_candidate = kdetemp.stdout.readline().strip() # read stdout kdedir_candidate = str(kdetemp.stdout.readline().strip()) # read stdout
if len(kdedir_candidate) == 0 or returncode != 0 or \ if len(kdedir_candidate) == 0 or returncode != 0 or \
not os.path.isabs(kdedir_candidate): not os.path.isabs(kdedir_candidate):
raise ValueError raise ValueError
else: else:
self.kdedir = kdedir_candidate + '/share/autostart' self.kdedir = kdedir_candidate + '/share/autostart'
except (OSError, ValueError): except (OSError, ValueError, FileNotFoundError):
# If kde-config isn't present, we'll check for kde-4.x # If kde-config isn't present, we'll check for kde-4.x
try: try:
kde4temp = subprocess.Popen(["kde4-config","--prefix"], stdout=subprocess.PIPE) kde4temp = subprocess.Popen(["kde4-config","--prefix"], stdout=subprocess.PIPE)
returncode = kde4temp.wait() # let it finish, and get the exit code returncode = kde4temp.wait() # let it finish, and get the exit code
kde4dir_candidate = kde4temp.stdout.readline().strip() # read stdout kde4dir_candidate = str(kde4temp.stdout.readline().strip()) # read stdout
if len(kde4dir_candidate) == 0 or returncode != 0 or \ if len(kde4dir_candidate) == 0 or returncode != 0 or \
not os.path.isabs(kde4dir_candidate): not os.path.isabs(kde4dir_candidate):
raise ValueError raise ValueError
else: else:
self.kdedir = kde4dir_candidate + '/share/autostart' self.kdedir = kde4dir_candidate + '/share/autostart'
except (OSError, ValueError): except (OSError, ValueError, FileNotFoundError):
# If neither kde-config nor kde4-config are not present or # If neither kde-config nor kde4-config are not present or
# return an error, then we can assume that kde isn't installed # return an error, then we can assume that kde isn't installed
# on the user's system # on the user's system
@@ -339,9 +339,9 @@ class configure(Command):
# if the option is not python (which is not a directory) # if the option is not python (which is not a directory)
if not argument[0][:-1] == "python": if not argument[0][:-1] == "python":
# see if it ends with a / # see if it ends with a /
if not value.endswith("/"): if not str(value).endswith("/"):
# if it doesn't, slap one on # if it doesn't, slap one on
setattr(self, argument_name, value + "/") setattr(self, argument_name, str(value) + "/")
else: else:
# as stated above, the python entry defines the beginning # as stated above, the python entry defines the beginning
# of the files section # of the files section
@@ -636,7 +636,7 @@ class compile_translations(Command):
print(len(output), returncode) print(len(output), returncode)
raise ValueError raise ValueError
else: else:
m = re.match('(\d+) translated messages(?:, (\d+) fuzzy translation)?(?:, (\d+) untranslated messages)?.', output) m = re.match(b'(\d+) translated messages(?:, (\d+) fuzzy translation)?(?:, (\d+) untranslated messages)?.', output)
if m: if m:
done, fuzzy, missing = m.groups() done, fuzzy, missing = m.groups()
fuzzy = int(fuzzy) if fuzzy else 0 fuzzy = int(fuzzy) if fuzzy else 0