Sandro Bonazzola has uploaded a new change for review. Change subject: validation: fix pyflakes and pep8 ......................................................................
validation: fix pyflakes and pep8 Fix issues detected by pyflakes and pep8 1.6.2 Change-Id: I97cf0fbbf761655b4bf95c0e046ce53e4473ebd4 Signed-off-by: Sandro Bonazzola <[email protected]> --- M packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py M packaging/setup/ovirt_engine_setup/reports/constants.py M packaging/setup/ovirt_engine_setup/reports/reportsutil.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/misc.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/protocols.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/service.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/config.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/pgpass.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/core/service.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/db/clear.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine-reports/engine.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/apache/reports.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/database.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/firewall.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/java.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jboss.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/protocols.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/misc.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/service.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/apache.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/jboss.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/misc.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py 33 files changed, 252 insertions(+), 137 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/08/39508/1 diff --git a/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py b/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py index 79f5fb6..4a16c04 100755 --- a/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py +++ b/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright 2014 Red Hat +# Copyright 2014-2015 Red Hat # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,12 +15,11 @@ # limitations under the License. +import gettext import os -import sys import re import shlex -import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') +import sys from Cheetah.Template import Template @@ -30,8 +29,12 @@ from ovirt_engine import configfile -from ovirt_engine import service from ovirt_engine import java +from ovirt_engine import service + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') class Daemon(service.Daemon): diff --git a/packaging/setup/ovirt_engine_setup/reports/constants.py b/packaging/setup/ovirt_engine_setup/reports/constants.py index 9323c9c..e27e630 100644 --- a/packaging/setup/ovirt_engine_setup/reports/constants.py +++ b/packaging/setup/ovirt_engine_setup/reports/constants.py @@ -19,21 +19,24 @@ """Constants.""" -import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') +import os from otopi import util from ovirt_engine_setup.constants import classproperty -from ovirt_engine_setup.constants import osetupattrsclass from ovirt_engine_setup.constants import osetupattrs +from ovirt_engine_setup.constants import osetupattrsclass from . import config +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export @util.codegen class Const(object): diff --git a/packaging/setup/ovirt_engine_setup/reports/reportsutil.py b/packaging/setup/ovirt_engine_setup/reports/reportsutil.py index 91dddad..febcc81 100644 --- a/packaging/setup/ovirt_engine_setup/reports/reportsutil.py +++ b/packaging/setup/ovirt_engine_setup/reports/reportsutil.py @@ -20,11 +20,10 @@ import atexit +import gettext import os import shutil import tempfile -import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') import libxml2 @@ -39,6 +38,10 @@ from . import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + class XMLDoc(base.Base): @property diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py index 288ffa5..eaf8c96 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,16 +17,19 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/misc.py index 9f35d22..b09783d 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/misc.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,17 +17,20 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/protocols.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/protocols.py index d134a80..28c59e7 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/protocols.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/protocols.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,17 +20,20 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """Protocols plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/service.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/service.py index fe9eb0f..cf39e27 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/service.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/service.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,17 +17,20 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/config.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/config.py index 2020ce7..c97d8b5 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/config.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/config.py @@ -18,18 +18,22 @@ """Config plugin.""" -import os + import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') +import os -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """Config plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py index 5eb0dcb..61ce26d 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,16 +19,15 @@ """Connection plugin.""" -import io import configparser -import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') +import io +import os from otopi import constants as otopicons -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine import configfile @@ -39,6 +38,10 @@ from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """Connection plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/pgpass.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/pgpass.py index 5976efd..1ee19db 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/pgpass.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/pgpass.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,17 +20,20 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup.reports import constants as oreportscons from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """DB pgpass plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/core/service.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/core/service.py index 0687b2c..d216990 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/core/service.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/core/service.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,17 +17,20 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/db/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/db/clear.py index 4d34100..46fbdfa 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/db/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/db/clear.py @@ -20,17 +20,22 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.reports import constants as oreportscons -from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import dialog +from ovirt_engine_setup.engine_common import database + + +from ovirt_engine_setup.reports import constants as oreportscons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py index 7187bb7..05766bd 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,21 +19,26 @@ """Clear plugin.""" +import gettext import os import shutil -import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.reports import constants as oreportscons from ovirt_engine_setup import dialog +from ovirt_engine_setup.reports import constants as oreportscons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """Clear plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine-reports/engine.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine-reports/engine.py index 516d03f..735af2b 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine-reports/engine.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine-reports/engine.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,21 +19,24 @@ """Engine plugin.""" -import urlparse import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') +import urlparse from otopi import constants as otopicons -from otopi import util -from otopi import plugin from otopi import filetransaction +from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """Engine plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/apache/reports.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/apache/reports.py index 68a70e0..75c8be1 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/apache/reports.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/apache/reports.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,24 +17,29 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') from otopi import constants as otopicons -from otopi import util from otopi import filetransaction from otopi import plugin +from otopi import util from ovirt_engine import util as outil from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.reports import constants as oreportscons from ovirt_engine_setup.engine_common \ import constants as oengcommcons +from ovirt_engine_setup.reports import constants as oreportscons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py index bef5dad..b8b014f 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,19 +17,24 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') from otopi import constants as otopicons -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.reports import constants as oreportscons from ovirt_engine_setup import dialog +from ovirt_engine_setup.reports import constants as oreportscons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/database.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/database.py index 72b06bb..858357b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/database.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/database.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,13 +20,12 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') from otopi import constants as otopicons -from otopi import util from otopi import filetransaction from otopi import plugin +from otopi import util from ovirt_engine import util as outil @@ -36,6 +35,10 @@ from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """Databsae plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py index 5549451..e733c63 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,19 +17,22 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') from otopi import constants as otopicons -from otopi import util from otopi import filetransaction from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/firewall.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/firewall.py index 48b38a7..a8a27ce 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/firewall.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/firewall.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,18 +20,22 @@ Firewall configuration plugin for Reports. """ + import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py index 8aee4d8..babdf85 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,19 +16,22 @@ # -import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') +import os -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/java.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/java.py index ef1133a..f7d46ca 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/java.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/java.py @@ -20,13 +20,12 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util -from otopi import plugin from otopi import constants as otopicons from otopi import filetransaction +from otopi import plugin +from otopi import util from ovirt_engine import configfile @@ -36,6 +35,10 @@ from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """Misc plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jboss.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jboss.py index 0b8587e..4ae48ba 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jboss.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jboss.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,21 +20,26 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') from otopi import constants as otopicons -from otopi import util from otopi import filetransaction from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.reports import constants as oreportscons from ovirt_engine_setup.engine_common \ import constants as oengcommcons +from ovirt_engine_setup.reports import constants as oreportscons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """JBoss plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/protocols.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/protocols.py index 3338bd9..f1b7bdd 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/protocols.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/protocols.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,17 +20,20 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') from otopi import constants as otopicons -from otopi import util from otopi import filetransaction from otopi import plugin +from otopi import util -from ovirt_engine_setup.reports import constants as oreportscons from ovirt_engine_setup import constants as osetupcons +from ovirt_engine_setup.reports import constants as oreportscons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py index 495afb3..3158a7b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,22 +17,27 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') from otopi import constants as otopicons -from otopi import util from otopi import filetransaction from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup import hostname as osetuphostname -from ovirt_engine_setup.reports import constants as oreportscons from ovirt_engine_setup.engine_common \ import constants as oengcommcons +from ovirt_engine_setup.reports import constants as oreportscons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/misc.py index 327a669..1f8becf 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/misc.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,17 +17,22 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.reports import constants as oreportscons -from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import dialog +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +from ovirt_engine_setup.reports import constants as oreportscons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/service.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/service.py index 9df4d35..b4c3769 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/service.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/service.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,17 +17,20 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py index 966ed68..183f87d 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,19 +20,24 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') from otopi import constants as otopicons +from otopi import plugin from otopi import transaction from otopi import util -from otopi import plugin + + +from ovirt_engine_setup.engine_common \ + import constants as oengcommcons +from ovirt_engine_setup.engine_common import database from ovirt_engine_setup.reports import constants as oreportscons -from ovirt_engine_setup.engine_common import database -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py index 00ade81..78cd5f2 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,17 +21,20 @@ """ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py index 1afeb46..8e5c427 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py @@ -19,34 +19,39 @@ """Schema plugin.""" -import glob import datetime -import tempfile +import gettext +import glob import os import shutil -import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') +import tempfile import libxml2 from otopi import constants as otopicons -from otopi import util from otopi import plugin from otopi import transaction +from otopi import util from ovirt_engine import util as outil from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.reports import constants as oreportscons -from ovirt_engine_setup.reports import reportsutil as oreportsutil from ovirt_engine_setup import util as osetuputil -from ovirt_engine_setup.engine_common import database from ovirt_engine_setup.engine_common \ import constants as oengcommcons +from ovirt_engine_setup.engine_common import database + + +from ovirt_engine_setup.reports import constants as oreportscons +from ovirt_engine_setup.reports import reportsutil as oreportsutil + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/apache.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/apache.py index 72d7022..4e6fb3f 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/apache.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/apache.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,19 +20,16 @@ import contextlib -import os -import urllib2 -import time - - import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') +import os +import time +import urllib2 from otopi import constants as otopicons from otopi import filetransaction -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons @@ -41,6 +38,10 @@ from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """apache pki plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/jboss.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/jboss.py index 4c1f854..dd3c1d7 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/jboss.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/jboss.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,15 +19,12 @@ """jboss PKI plugin.""" +import gettext import os -import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') - - -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons @@ -36,6 +33,10 @@ from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """jboss pki plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/misc.py index dbc7b14..6dbeeeb 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/pki/misc.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,23 +19,24 @@ """misc PKI plugin.""" +import gettext import os -import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') - - -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import util as osetuputil +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.reports import constants as oreportscons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """misc pki plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py index b712d5c..3786331 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,21 +20,26 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.reports import constants as oreportscons +from ovirt_engine_setup import dialog from ovirt_engine_setup.engine_common \ import constants as oengcommcons -from ovirt_engine_setup import dialog from ovirt_engine_setup.engine_common import postgres +from ovirt_engine_setup.reports import constants as oreportscons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-reports') + + @util.export class Plugin(plugin.PluginBase): """Local Postgres plugin.""" -- To view, visit https://gerrit.ovirt.org/39508 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97cf0fbbf761655b4bf95c0e046ce53e4473ebd4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
