Fixups to make modules findable after text and gui file renaming

34 files changed, 76 insertions, 72 deletions

diff --git a/Makefile b/Makefile
index 67e434840..ed25d4118 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ include Makefile.inc
 
 VERSION = 7.0
 
-SUBDIRSHD = rpmmodule balkan isys libfdisk collage loader po \
+SUBDIRSHD = balkan isys libfdisk collage loader po \
 	    minislang textw utils scripts bootdisk
 SUBDIRS = $(SUBDIRSHD)
 
diff --git a/anaconda b/anaconda
index 5f95c85ec..44099b51e 100755
--- a/anaconda
+++ b/anaconda
@@ -10,12 +10,15 @@ sys.path.append('/usr/lib/anaconda')
 
 # For anaconda in test mode
 if (os.path.exists('rpmmodule')):
-    sys.path.append('rpmmodule')
+#    sys.path.append('rpmmodule')
     sys.path.append('libfdisk')
     sys.path.append('balkan')
-    sys.path.append('kudzu')
+#    sys.path.append('kudzu')
     sys.path.append('gnome-map')
     sys.path.append('isys')
+    sys.path.append('textw')
+    sys.path.append('iw')
+
 
 os.environ['HOME'] = '/tmp'
 
diff --git a/gui.py b/gui.py
index 56778fe9a..efd0d6da2 100755
--- a/gui.py
+++ b/gui.py
@@ -47,11 +47,12 @@ from gnome.xmhtml import *
 #
 # instead we do (assuming pythonpath set correctly)
 #
-import language_gui
-import welcome_gui
-import mouse_gui
-import keyboard_gui
-import installpath_gui
+from language_gui import *
+from welcome_gui import *
+from mouse_gui import *
+
+from keyboard_gui import *
+from installpath_gui import *
 
 import isys
 import sys
diff --git a/iw/account_gui.py b/iw/account_gui.py
index 1efe27596..b54f09ee3 100644
--- a/iw/account_gui.py
+++ b/iw/account_gui.py
@@ -1,5 +1,5 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 from translate import _
 import re
 import string
diff --git a/iw/auth_gui.py b/iw/auth_gui.py
index 0d99018de..0e3e48309 100644
--- a/iw/auth_gui.py
+++ b/iw/auth_gui.py
@@ -1,5 +1,5 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 from translate import _
 
 class AuthWindow (InstallWindow):
diff --git a/iw/bootdisk_gui.py b/iw/bootdisk_gui.py
index b9a16a479..303266f1e 100644
--- a/iw/bootdisk_gui.py
+++ b/iw/bootdisk_gui.py
@@ -1,4 +1,4 @@
-from iw import *
+from iw_gui import *
 from gtk import *
 from translate import _
 import iutil
diff --git a/iw/confirm_gui.py b/iw/confirm_gui.py
index 6a236b8d6..c940072b3 100644
--- a/iw/confirm_gui.py
+++ b/iw/confirm_gui.py
@@ -1,5 +1,5 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 from translate import _
 
 class ConfirmWindow (InstallWindow):
diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py
index 8e1f7745e..dacdb9cc0 100644
--- a/iw/congrats_gui.py
+++ b/iw/congrats_gui.py
@@ -1,6 +1,6 @@
 from gtk import *
 from gnome.ui import *
-from iw import *
+from iw_gui import *
 from translate import _
 
 class CongratulationWindow (InstallWindow):		
diff --git a/iw/dependencies_gui.py b/iw/dependencies_gui.py
index f06dabc9b..075f01fa5 100644
--- a/iw/dependencies_gui.py
+++ b/iw/dependencies_gui.py
@@ -1,4 +1,4 @@
-from iw import *
+from iw_gui import *
 from gtk import *
 from translate import _
 
diff --git a/iw/examine_gui.py b/iw/examine_gui.py
index 6a4479d0f..5f9cb1b1f 100644
--- a/iw/examine_gui.py
+++ b/iw/examine_gui.py
@@ -1,6 +1,6 @@
 from gtk import *
-from iw import *
-from package import *
+from iw_gui import *
+from package_gui import *
 from translate import _
 
 class UpgradeExamineWindow (InstallWindow):		
diff --git a/iw/fdisk_gui.py b/iw/fdisk_gui.py
index 714a6d6f3..eb8f7ddac 100644
--- a/iw/fdisk_gui.py
+++ b/iw/fdisk_gui.py
@@ -1,5 +1,5 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 from gnome.zvt import *
 from translate import _
 import isys
@@ -30,7 +30,7 @@ class FDiskWindow (InstallWindow):
 	self.todo.fstab.rescanPartitions()
 
     def getNext(self):
-        from installpath import InstallPathWindow
+        from installpath_gui import InstallPathWindow
         if ((not InstallPathWindow.fdisk) or
             (not InstallPathWindow.fdisk.get_active ())):
                return None
@@ -73,7 +73,7 @@ class FDiskWindow (InstallWindow):
         self.ics.setNextEnabled (0)
 
     def getScreen (self):
-        from installpath import InstallPathWindow
+        from installpath_gui import InstallPathWindow
         if ((not InstallPathWindow.fdisk) or
             (not InstallPathWindow.fdisk.get_active ())):
                return None
diff --git a/iw/format_gui.py b/iw/format_gui.py
index 1aee7e315..3ac29a3cc 100644
--- a/iw/format_gui.py
+++ b/iw/format_gui.py
@@ -1,5 +1,5 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 from thread import *
 import isys
 from translate import _
diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py
index f26cdd723..586b3bb4c 100644
--- a/iw/installpath_gui.py
+++ b/iw/installpath_gui.py
@@ -1,26 +1,26 @@
 from gtk import *
-from iw import *
-from language import *
-from welcome import *
-from progress import *
-from package import *
-from network import *
-from account import *
-from auth import *
-from mouse import *
-from keyboard import *
-from format import *
-from congrats import *
-from dependencies import *
-from lilo import *
-from silo import *
-from examine import *
-from bootdisk import *
-from timezone import *
-from xconfig import *
-from fdisk import *
-from rootpartition import *
-from confirm import *
+from iw_gui import *
+from language_gui import *
+from welcome_gui import *
+from progress_gui import *
+from package_gui import *
+from network_gui import *
+from account_gui import *
+from auth_gui import *
+from mouse_gui import *
+from keyboard_gui import *
+from format_gui import *
+from congrats_gui import *
+from dependencies_gui import *
+from lilo_gui import *
+from silo_gui import *
+from examine_gui import *
+from bootdisk_gui import *
+from timezone_gui import *
+from xconfig_gui import *
+from fdisk_gui import *
+from rootpartition_gui import *
+from confirm_gui import *
 import iutil
 from translate import _
 import installclass
diff --git a/iw/keyboard_gui.py b/iw/keyboard_gui.py
index e9d6f0a00..30385bb3c 100644
--- a/iw/keyboard_gui.py
+++ b/iw/keyboard_gui.py
@@ -1,8 +1,8 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 import xkb
 import string
-import keyboard
+#import keyboard
 from translate import _
 from kbd import Keyboard
 import iutil
diff --git a/iw/language_gui.py b/iw/language_gui.py
index 68cbe707b..079273c30 100644
--- a/iw/language_gui.py
+++ b/iw/language_gui.py
@@ -1,5 +1,5 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 from translate import _
 
 class LanguageWindow (InstallWindow):
diff --git a/iw/lilo_gui.py b/iw/lilo_gui.py
index c36714b45..be84cefa3 100644
--- a/iw/lilo_gui.py
+++ b/iw/lilo_gui.py
@@ -1,9 +1,9 @@
 # must replace with explcit form so update disks will work
-#from iw import *
+from iw_gui import *
 
 from gtk import *
 from translate import _
-from xpms import SMALL_CHECK
+from xpms_gui import SMALL_CHECK
 import GdkImlib
 
 class LiloWindow (InstallWindow):
diff --git a/iw/mouse_gui.py b/iw/mouse_gui.py
index 040053807..500ea75fe 100644
--- a/iw/mouse_gui.py
+++ b/iw/mouse_gui.py
@@ -1,8 +1,7 @@
 from gtk import *
 
 # must replace with explcit form so update disks will work
-#from iw import *
-
+from iw_gui import *
 from string import *
 from re import *
 import tree
diff --git a/iw/network_gui.py b/iw/network_gui.py
index 85b2c5722..25aa62f5d 100644
--- a/iw/network_gui.py
+++ b/iw/network_gui.py
@@ -1,5 +1,5 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 from isys import *
 from translate import _
 
diff --git a/iw/package_gui.py b/iw/package_gui.py
index 4d64849a1..fefe5e0c4 100644
--- a/iw/package_gui.py
+++ b/iw/package_gui.py
@@ -1,14 +1,14 @@
 from gtk import *
 from gnome.ui import *
-from iw import *
+from iw_gui import *
 from string import *
 from thread import *
-from examine import *
+from examine_gui import *
 import rpm
 import GdkImlib
 import string
 import sys
-import xpms
+import xpms_gui
 from translate import _
 
 class IndividualPackageSelectionWindow (InstallWindow):
diff --git a/iw/progress_gui.py b/iw/progress_gui.py
index f1cd709b5..c0ed7269c 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -1,5 +1,5 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 import string
 import rpm
 import time
diff --git a/iw/rootpartition_gui.py b/iw/rootpartition_gui.py
index bef01cb2c..48f0d96cc 100644
--- a/iw/rootpartition_gui.py
+++ b/iw/rootpartition_gui.py
@@ -1,10 +1,10 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 from thread import *
 import isys
 from translate import _
 import gui
-from fdisk import *
+from fdisk_gui import *
 import isys
 import iutil
 
@@ -193,7 +193,7 @@ class AutoPartitionWindow(InstallWindow):
 	self.beingDisplayed = 0
 
     def getScreen (self):   
-        from installpath import InstallPathWindow
+        from installpath_gui import InstallPathWindow
 
         if (InstallPathWindow.fdisk and
             InstallPathWindow.fdisk.get_active ()):
diff --git a/iw/silo_gui.py b/iw/silo_gui.py
index 588ff7c02..2241b2b70 100644
--- a/iw/silo_gui.py
+++ b/iw/silo_gui.py
@@ -1,9 +1,9 @@
 # must replace with explcit form so update disks will work
-#from iw import *
+from iw_gui import *
 
 from gtk import *
 from translate import _
-from xpms import SMALL_CHECK
+from xpms_gui import SMALL_CHECK
 import GdkImlib
 
 class SiloWindow (InstallWindow):
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index 959793b33..d51f5c34c 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -1,5 +1,5 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 import string
 from gnome.ui import GnomeCanvas
 from translate import _
diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py
index 10e2e97ab..cd3612cfd 100644
--- a/iw/welcome_gui.py
+++ b/iw/welcome_gui.py
@@ -1,6 +1,6 @@
 from gtk import *
 from gnome.ui import *
-from iw import *
+from iw_gui import *
 from translate import _
 
 class WelcomeWindow (InstallWindow):		
diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py
index def2bd999..24da782b1 100644
--- a/iw/xconfig_gui.py
+++ b/iw/xconfig_gui.py
@@ -1,5 +1,5 @@
 from gtk import *
-from iw import *
+from iw_gui import *
 from translate import _
 
 import string
diff --git a/text.py b/text.py
index b1e720560..dc80b758b 100644
--- a/text.py
+++ b/text.py
@@ -40,12 +40,12 @@ from translate import _, cat
 #
 # instead we do
 #
-import constants
+from constants_text import *
 from lilo_text import LiloWindow
 from lilo_text import LiloAppendWindow
 from lilo_text import LiloImagesWindow
 from silo_text import SiloWindow
-from silo_text import SiloApeendWindow
+from silo_text import SiloAppendWindow
 from silo_text import SiloImagesWindow
 from network_text import NetworkWindow
 from network_text import HostnameWindow
@@ -56,6 +56,7 @@ from partitioning_text import PartitionMethod
 from partitioning_text import LoopSizeWindow
 from partitioning_text import ManualPartitionWindow
 from partitioning_text import AutoPartitionWindow
+from partitioning_text import PartitionWindow
 from partitioning_text import TurnOnSwapWindow
 from partitioning_text import FormatWindow
 from packages_text import PackageGroupWindow
diff --git a/textw/bootdisk_text.py b/textw/bootdisk_text.py
index 9c6e5624b..bc7db0785 100644
--- a/textw/bootdisk_text.py
+++ b/textw/bootdisk_text.py
@@ -1,7 +1,7 @@
 import iutil
 from translate import _
 from snack import *
-from constants import *
+from constants_text import *
 
 class BootDiskWindow:
     def __call__(self, screen, todo):
diff --git a/textw/lilo_text.py b/textw/lilo_text.py
index 81b567033..972f27d5c 100644
--- a/textw/lilo_text.py
+++ b/textw/lilo_text.py
@@ -1,6 +1,6 @@
 #import gettext
 from snack import *
-from constants import *
+from constants_text import *
 from translate import _
 import string
 
diff --git a/textw/network_text.py b/textw/network_text.py
index 5e1bbd7a4..673f14cb2 100644
--- a/textw/network_text.py
+++ b/textw/network_text.py
@@ -2,7 +2,7 @@ import iutil
 import os
 import isys
 from snack import *
-from constants import *
+from constants_text import *
 from translate import _
 
 class NetworkWindow:
diff --git a/textw/packages_text.py b/textw/packages_text.py
index 976be80b1..cdb550d81 100644
--- a/textw/packages_text.py
+++ b/textw/packages_text.py
@@ -1,7 +1,7 @@
 import rpm
 #import gettext
 from snack import *
-from constants import *
+from constants_text import *
 from translate import _
 
 class PackageGroupWindow:
diff --git a/textw/partitioning_text.py b/textw/partitioning_text.py
index 234a6d419..0b5b2b3a8 100644
--- a/textw/partitioning_text.py
+++ b/textw/partitioning_text.py
@@ -2,7 +2,7 @@ import iutil
 import os
 import isys
 from snack import *
-from constants import *
+from constants_text import *
 from translate import _
 
 class PartitionMethod:
diff --git a/textw/silo_text.py b/textw/silo_text.py
index dcd94d4f4..a74173974 100644
--- a/textw/silo_text.py
+++ b/textw/silo_text.py
@@ -1,7 +1,7 @@
 #import gettext
 import iutil
 from snack import *
-from constants import *
+from constants_text import *
 from translate import _
 
 #cat = gettext.Catalog ("anaconda", "/usr/share/locale")
diff --git a/textw/timezone_text.py b/textw/timezone_text.py
index 4420cc538..ea69a3902 100644
--- a/textw/timezone_text.py
+++ b/textw/timezone_text.py
@@ -3,7 +3,7 @@ import iutil
 import os
 from time import *
 from snack import *
-from constants import *
+from constants_text import *
 from translate import _
 
 class TimezoneWindow:
diff --git a/textw/userauth_text.py b/textw/userauth_text.py
index 8da6cbe9e..d1ee8459f 100644
--- a/textw/userauth_text.py
+++ b/textw/userauth_text.py
@@ -1,6 +1,6 @@
 #import gettext_rh
 from snack import *
-from constants import *
+from constants_text import *
 from translate import _
 import iutil