gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-02-22 10:05:48 +01:00
Code Issues Projects Releases Wiki Activity

Use log instead of print in setup.py

Browse Source
This commit is contained in:
gryf
2020-08-25 21:31:28 +02:00
parent 10fde3e73f
commit 3e4d17122f
1 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
setup.py
View File

@@ -23,6 +23,7 @@ import os
import re import re
import shutil import shutil
import subprocess import subprocess
from distutils import log
from distutils.command import build as _build from distutils.command import build as _build
import setuptools import setuptools
@@ -181,11 +182,11 @@ class configure(setuptools.Command):
self.ddistro = 'FAIL' self.ddistro = 'FAIL'
# self.no_install_init = True # self.no_install_init = True
# self.distro_detect_failed = True # self.distro_detect_failed = True
print('WARNING: Unable to detect the distribution in use.\n' log.warn('WARNING: Unable to detect the distribution in use.\nIf '
'If you have specified --distro or --init and --initfile, ' 'you have specified --distro or --init and --initfile, '
'configure will continue.\nPlease report this warning, ' 'configure will continue.\nPlease report this warning, '
'along with the name of your distribution, to the wicd ' 'along with the name of your distribution, to the wicd '
'developers.') 'developers.')
# Try to get the pm-utils sleep hooks directory from pkg-config. # Try to get the pm-utils sleep hooks directory from pkg-config.
# Don't run these in a shell because it's not needed and because shell # Don't run these in a shell because it's not needed and because shell
@@ -215,7 +216,7 @@ class configure(setuptools.Command):
self.logperms = '0600' self.logperms = '0600'
def distro_check(self): def distro_check(self):
print("Distro is: " + self.distro) log.info("Distro is: %s", self.distro)
if self.distro is None and self.detected_distro != 'FAIL': if self.distro is None and self.detected_distro != 'FAIL':
self.distro = self.detected_distro self.distro = self.detected_distro
@@ -263,9 +264,9 @@ class configure(setuptools.Command):
self.distro_check() self.distro_check()
if self.distro_detect_failed and not self.no_install_init and \ if self.distro_detect_failed and not self.no_install_init and \
'FAIL' in [self.init, self.initfile]: 'FAIL' in [self.init, self.initfile]:
print('ERROR: Failed to detect distro. Configure cannot ' log.error('ERROR: Failed to detect distro. Configure cannot '
'continue.\nPlease specify --init and --initfile to ' 'continue.\nPlease specify --init and --initfile to '
'continue with configuration.') 'continue with configuration.') # raise?
# loop through the argument definitions in user_options # loop through the argument definitions in user_options
for argument in self.user_options: for argument in self.user_options:
@@ -291,27 +292,26 @@ class configure(setuptools.Command):
if argument[0].endswith('='): if argument[0].endswith('='):
cur_arg = argument[0][:-1] cur_arg = argument[0][:-1]
cur_arg_value = getattr(self, cur_arg.replace('-', '_')) cur_arg_value = getattr(self, cur_arg.replace('-', '_'))
print("%s is %s" % (cur_arg, cur_arg_value)) log.info("%s is %s", cur_arg, cur_arg_value)
values.append((cur_arg, getattr(self, cur_arg.replace('-', values.append((cur_arg, getattr(self, cur_arg.replace('-',
'_')))) '_'))))
else: else:
cur_arg = argument[0] cur_arg = argument[0]
cur_arg_value = getattr(self, cur_arg.replace('-', '_')) cur_arg_value = getattr(self, cur_arg.replace('-', '_'))
print("Found switch %s %s" % (argument, cur_arg_value)) log.info("Found switch %s %s", argument, cur_arg_value)
values.append((cur_arg, bool(cur_arg_value))) values.append((cur_arg, bool(cur_arg_value)))
print('Replacing values in template files...') log.info('Replacing values in template files...')
for item in os.listdir('in'): for item in os.listdir('in'):
if item.endswith('.in'): if item.endswith('.in'):
print('Replacing values in', item, end=' ')
original_name = os.path.join('in', item) original_name = os.path.join('in', item)
item_in = open(original_name, 'r') item_in = open(original_name, 'r')
final_name = item[:-3].replace('=', '/') final_name = item[:-3].replace('=', '/')
parent_dir = os.path.dirname(final_name) parent_dir = os.path.dirname(final_name)
if parent_dir and not os.path.exists(parent_dir): if parent_dir and not os.path.exists(parent_dir):
print('(mkdir %s)' % parent_dir, end=' ') log.info('(mkdir %s)', parent_dir)
os.makedirs(parent_dir) os.makedirs(parent_dir)
print(final_name) log.info('Replacing values in %s to %s', item, final_name)
item_out = open(final_name, 'w') item_out = open(final_name, 'w')
for line in item_in.readlines(): for line in item_in.readlines():
for item, value in values: for item, value in values:
@@ -343,18 +343,16 @@ class clear_generated(setuptools.Command):
pass pass
def run(self): def run(self):
print('Removing completed template files...') log.info('Removing completed template files...')
for item in os.listdir('in'): for item in os.listdir('in'):
if item.endswith('.in'): if item.endswith('.in'):
print('Removing completed', item, end=' ')
final_name = item[:-3].replace('=', '/') final_name = item[:-3].replace('=', '/')
print(final_name, '...', end=' ')
if os.path.exists(final_name): if os.path.exists(final_name):
os.remove(final_name) os.remove(final_name)
print('Removed.') log.info('Removing completed %s (%s)', final_name, item)
else: else:
print('Does not exist.') log.info('%s Does not exist.', final_name)
print('Removing compiled translation files...') log.info('Removing compiled translation files...')
if os.path.exists('translations'): if os.path.exists('translations'):
shutil.rmtree('translations/') shutil.rmtree('translations/')
os.makedirs('translations/') os.makedirs('translations/')
@@ -447,16 +445,15 @@ class install(_install.install):
data.append((wpath.suspend, ['other/50-wicd-suspend.sh'])) data.append((wpath.suspend, ['other/50-wicd-suspend.sh']))
if not wpath.no_install_pmutils: if not wpath.no_install_pmutils:
data.append((wpath.pmutils, ['other/55wicd'])) data.append((wpath.pmutils, ['other/55wicd']))
print('Using pid path', os.path.basename(wpath.pidfile)) log.info('Using pid path %s', os.path.basename(wpath.pidfile))
if not wpath.no_install_i18n: if not wpath.no_install_i18n:
print('Language support for', end=' ') print('Language support for', end=' ')
for language in sorted(glob('translations/*')): for language in sorted(glob('translations/*')):
language = language.replace('translations/', '') language = language.replace('translations/', '')
print(language, end=' ') log.info('Language support for %s', language)
data.append((wpath.translations + language + '/LC_MESSAGES/', data.append((wpath.translations + language + '/LC_MESSAGES/',
['translations/' + language + ['translations/' + language +
'/LC_MESSAGES/wicd.mo'])) '/LC_MESSAGES/wicd.mo']))
print()
_install.install.run(self) _install.install.run(self)
@@ -473,9 +470,9 @@ class test(setuptools.Command):
pass pass
def run(self): def run(self):
print("importing tests") log.info("importing tests")
import tests import tests
print('running tests') log.info('running tests')
tests.run_tests() tests.run_tests()
@@ -552,7 +549,7 @@ class compile_translations(setuptools.Command):
returncode = msgfmt.wait() returncode = msgfmt.wait()
output = msgfmt.stderr.readline().strip().decode('utf-8') output = msgfmt.stderr.readline().strip().decode('utf-8')
if len(output) == 0 or returncode != 0: if len(output) == 0 or returncode != 0:
print(len(output), returncode) log.info("%s %s", len(output), returncode)
raise ValueError raise ValueError
else: else:
m = re.match(r'(\d+) translated messages(?:, (\d+) ' m = re.match(r'(\d+) translated messages(?:, (\d+) '
@@ -568,12 +565,12 @@ class compile_translations(setuptools.Command):
if completeness >= self.threshold: if completeness >= self.threshold:
compile_po = True compile_po = True
else: else:
print('Disabled %s (%s%% < %s%%).' % log.info('Disabled %s (%s%% < %s%%).',
(lang, completeness*100, lang, completeness*100,
self.threshold*100)) self.threshold*100)
continue continue
except (OSError, ValueError): except (OSError, ValueError):
print('ARGH') log.error('ARGH. Yeah, seriosuly.')
if compile_po: if compile_po:
os.makedirs('translations/' + lang + '/LC_MESSAGES/') os.makedirs('translations/' + lang + '/LC_MESSAGES/')