[node-patches] Change in ovirt-node[master]: src: Several syntax fixes for check-local
fabiand at fedoraproject.org
fabiand at fedoraproject.org
Thu May 30 19:01:12 UTC 2013
Fabian Deutsch has uploaded a new change for review.
Change subject: src: Several syntax fixes for check-local
......................................................................
src: Several syntax fixes for check-local
make check-local in src/ passes now.
Change-Id: Iec0df593e228f8d396a5307a5ad55532bf911e0a
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/app.py
M src/ovirt/node/installer/core/keyboard_page.py
M src/ovirt/node/installer/core/upgrade_page.py
M src/ovirt/node/plugins.py
M src/ovirt/node/setup/cim/__init__.py
M src/ovirt/node/setup/core/__init__.py
M src/ovirt/node/setup/core/support_page.py
M src/ovirt/node/setup/snmp/__init__.py
8 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/38/15238/1
diff --git a/src/ovirt/node/app.py b/src/ovirt/node/app.py
index 5653965..b08387c 100644
--- a/src/ovirt/node/app.py
+++ b/src/ovirt/node/app.py
@@ -401,7 +401,7 @@
(plugin.name(), plugin))
if plugin.name() in self.__plugins:
raise RuntimeError("Plugin with name '%s' is already registered" %
- plugin.name())
+ plugin.name())
self.__plugins[plugin.name()] = plugin
self.ui.register_plugin(plugin.ui_name(), plugin)
diff --git a/src/ovirt/node/installer/core/keyboard_page.py b/src/ovirt/node/installer/core/keyboard_page.py
index 54f617a..29adac3 100644
--- a/src/ovirt/node/installer/core/keyboard_page.py
+++ b/src/ovirt/node/installer/core/keyboard_page.py
@@ -20,7 +20,8 @@
# also available at http://www.gnu.org/copyleft/gpl.html.
from ovirt.node import plugins, ui
from ovirt.node.utils import system
-import welcome_page, upgrade_page
+import welcome_page
+import upgrade_page
"""
Keyboard page of the installer
diff --git a/src/ovirt/node/installer/core/upgrade_page.py b/src/ovirt/node/installer/core/upgrade_page.py
index d23a186..81b43da 100644
--- a/src/ovirt/node/installer/core/upgrade_page.py
+++ b/src/ovirt/node/installer/core/upgrade_page.py
@@ -20,7 +20,8 @@
# also available at http://www.gnu.org/copyleft/gpl.html.
from ovirt.node import plugins, ui, exceptions
from ovirt.node.utils import security
-import keyboard_page, progress_page
+import keyboard_page
+import progress_page
"""
Password confirmation page for the upgarde part of the installer
diff --git a/src/ovirt/node/plugins.py b/src/ovirt/node/plugins.py
index 642863d..b11523c 100644
--- a/src/ovirt/node/plugins.py
+++ b/src/ovirt/node/plugins.py
@@ -19,7 +19,6 @@
# MA 02110-1301, USA. A copy of the GNU General Public License is
# also available at http://www.gnu.org/copyleft/gpl.html.
from ovirt.node import base, exceptions, ui
-import imp
import logging
import pkgutil
diff --git a/src/ovirt/node/setup/cim/__init__.py b/src/ovirt/node/setup/cim/__init__.py
index 1cb5866..6eed806 100644
--- a/src/ovirt/node/setup/cim/__init__.py
+++ b/src/ovirt/node/setup/cim/__init__.py
@@ -22,8 +22,8 @@
"""
CIM Plugin
"""
+import cim_page
-from . import cim_page
#
# Magic function to register all plugins to be used
diff --git a/src/ovirt/node/setup/core/__init__.py b/src/ovirt/node/setup/core/__init__.py
index 7d49e4c..a3be97f 100644
--- a/src/ovirt/node/setup/core/__init__.py
+++ b/src/ovirt/node/setup/core/__init__.py
@@ -24,6 +24,7 @@
"""
from ovirt.node import plugins
+
#
# Magic function to register all plugins to be used
#
diff --git a/src/ovirt/node/setup/core/support_page.py b/src/ovirt/node/setup/core/support_page.py
index 6c18ffd..7a9f5a8 100644
--- a/src/ovirt/node/setup/core/support_page.py
+++ b/src/ovirt/node/setup/core/support_page.py
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA. A copy of the GNU General Public License is
# also available at http://www.gnu.org/copyleft/gpl.html.
-from ovirt.node import ui, utils
+from ovirt.node import ui
from ovirt.node.plugins import NodePlugin
from ovirt.node.utils import process
diff --git a/src/ovirt/node/setup/snmp/__init__.py b/src/ovirt/node/setup/snmp/__init__.py
index eb64204..63a5328 100644
--- a/src/ovirt/node/setup/snmp/__init__.py
+++ b/src/ovirt/node/setup/snmp/__init__.py
@@ -22,8 +22,8 @@
"""
SNMP Plugin
"""
+import snmp_page
-from . import snmp_page
#
# Magic function to register all plugins to be used
--
To view, visit http://gerrit.ovirt.org/15238
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec0df593e228f8d396a5307a5ad55532bf911e0a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>
More information about the node-patches
mailing list