[Uludag-commits] r11971 - in trunk/yali: . extensions yali yali/gui

[svn-uludag at uludag.org.tr]

Author: baris
Date: Sun Jan 14 16:09:06 2007
New Revision: 11971

Removed:
   trunk/yali/extensions/xcapslock.c
Modified:
   trunk/yali/setup.py
   trunk/yali/yali/gui/ScrAdmin.py
   trunk/yali/yali/gui/ScrUsers.py
   trunk/yali/yali/sysutils.py
Log:
Start using PMP (Python Modules for Pardus).


Modified: trunk/yali/setup.py
=================================================================
--- trunk/yali/setup.py	(original)
+++ trunk/yali/setup.py	Sun Jan 14 16:09:06 2007
@@ -164,16 +164,6 @@
             shutil.copy("po/%s.mo" % lang, os.path.join(destpath, "%s.mo" % i18n_domain))
 
 
-
-yalisysmodule = Extension('yalisys',
-                        sources = ['extensions/yalisys.c'],
-                        extra_compile_args = ['-Wall'])
-xcapslockmodule = Extension('xcapslock',
-                            sources = ['extensions/xcapslock.c'],
-                            libraries = ['X11'],
-                            extra_compile_args = ['-Wall'])
-
-
 setup(name="yali",
       version= getVersion(),
       description="YALI (Yet Another Linux Installer)",
@@ -188,7 +178,9 @@
                     ('/usr/share/yali/slideshow', gui_slidepics()),
                     ('/usr/share/yali/user_faces', user_faces())],
       scripts = ['yali-bin'],
-      ext_modules = [yalisysmodule, xcapslockmodule],
+      ext_modules = [Extension('yalisys',
+                            sources = ['extensions/yalisys.c'],
+                            extra_compile_args = ['-Wall'])],
       cmdclass = {
         'build' : YaliBuild,
         'clean' : YaliClean,

Modified: trunk/yali/yali/gui/ScrAdmin.py
=================================================================
--- trunk/yali/yali/gui/ScrAdmin.py	(original)
+++ trunk/yali/yali/gui/ScrAdmin.py	Sun Jan 14 16:09:06 2007
@@ -23,7 +23,7 @@
 import yali.users
 import yali.sysutils
 import yali.gui.context as ctx
-import xcapslock
+import pmp.xorg
 
 
 ##
@@ -91,7 +91,7 @@
         return True
 
     def checkCapsLock(self):
-        if xcapslock.isOn():
+        if pmp.xorg.capslock.isOn():
             self.caps_error.setText(
                 _('<font color="#FF6D19">Caps Lock is on!</font>'))
         else:

Modified: trunk/yali/yali/gui/ScrUsers.py
=================================================================
--- trunk/yali/yali/gui/ScrUsers.py	(original)
+++ trunk/yali/yali/gui/ScrUsers.py	Sun Jan 14 16:09:06 2007
@@ -22,7 +22,7 @@
 from yali.gui.ScreenWidget import ScreenWidget
 from yali.gui.Ui.setupuserswidget import SetupUsersWidget
 import yali.gui.context as ctx
-import xcapslock
+import pmp.xorg
 
 ##
 # Partitioning screen.
@@ -91,7 +91,7 @@
         return True
 
     def checkCapsLock(self):
-        if xcapslock.isOn():
+        if pmp.xorg.capslock.isOn():
             self.caps_error.setText(
                 _('<font color="#FF6D19">Caps Lock is on!</font>'))
         else:

Modified: trunk/yali/yali/sysutils.py
=================================================================
--- trunk/yali/yali/sysutils.py	(original)
+++ trunk/yali/yali/sysutils.py	Sun Jan 14 16:09:06 2007
@@ -16,24 +16,10 @@
 import yalisys
 from string import ascii_letters
 from string import digits
+from pmp.sysutils import find_executable
 
 from yali.constants import consts
 
-def find_executable(exec_name):
-    # preppend /bin, /sbin explicitly to handle system configuration
-    # errors
-    paths = ["/bin", "/sbin"]
-
-    paths.extend(os.getenv("PATH").split(':'))
-
-    for p in paths:
-        exec_path = os.path.join(p, exec_name)
-        if os.path.exists(exec_path):
-            return exec_path
-
-    return None
-
-    
 ##
 # run comar daemon in chroot
 def chroot_comar():