[master 06/11] modules: changes to the import statements directly under pyanaconda/

[Ales Kozumplik <akozumpl@xxxxxxxxxx>]

---
 pyanaconda/__init__.py |    2 +-
 pyanaconda/gui.py      |    8 ++++----
 pyanaconda/rescue.py   |    2 +-
 pyanaconda/vnc.py      |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py
index f773933..f5056df 100644
--- a/pyanaconda/__init__.py
+++ b/pyanaconda/__init__.py
@@ -155,7 +155,7 @@ class Anaconda(object):
     @property
     def platform(self):
         if not self._platform:
-            import platform
+            import pyanaconda.platform as platform
             self._platform = platform.getPlatform(self)
 
         return self._platform
diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py
index f970ee5..3f9e2a3 100755
--- a/pyanaconda/gui.py
+++ b/pyanaconda/gui.py
@@ -899,7 +899,7 @@ class InstallInterface(InstallInterfaceBase):
         if len(self.anaconda.network.netdevices) == 0:
             return False
 
-        from network_gui import (runNMCE,
+        from iw.network_gui import (runNMCE,
                                  selectNetDevicesDialog,
                                  selectSSIDsDialog)
 
@@ -1024,19 +1024,19 @@ class InstallInterface(InstallInterfaceBase):
         return rc
 
     def createRepoWindow(self):
-        from task_gui import RepoCreator
+        from iw.task_gui import RepoCreator
         dialog = RepoCreator(self.anaconda)
         dialog.createDialog()
         dialog.run()
 
     def editRepoWindow(self, repoObj):
-        from task_gui import RepoEditor
+        from iw.task_gui import RepoEditor
         dialog = RepoEditor(self.anaconda, repoObj)
         dialog.createDialog()
         dialog.run()
 
     def methodstrRepoWindow(self, methodstr):
-        from task_gui import RepoMethodstrEditor
+        from iw.task_gui import RepoMethodstrEditor
         dialog = RepoMethodstrEditor(self.anaconda, methodstr)
         dialog.createDialog()
         return dialog.run()
diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py
index f0171b3..673d7ff 100644
--- a/pyanaconda/rescue.py
+++ b/pyanaconda/rescue.py
@@ -23,7 +23,7 @@
 import upgrade
 from snack import *
 from constants import *
-from constants_text import *
+from textw.constants_text import *
 from text import WaitWindow, OkCancelWindow, ProgressWindow, PassphraseEntryWindow, stepToClasses
 from flags import flags
 import sys
diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py
index 0a6a049..2db9ed4 100644
--- a/pyanaconda/vnc.py
+++ b/pyanaconda/vnc.py
@@ -23,7 +23,7 @@ import os, sys, string
 import time
 from snack import *
 from constants import *
-from constants_text import *
+from textw.constants_text import *
 import network
 import isys
 import product
-- 
1.7.0.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list