Author: dmeyer
Date: Sun Mar 2 11:49:40 2008
New Revision: 3149
Log:
rename glib to gobject
Added:
trunk/base/src/notifier/gobject.py
- copied, changed from r3142, /trunk/base/src/notifier/glib.py
trunk/base/test/gobject.py
- copied unchanged from r3143, /trunk/base/test/glib.py
Removed:
trunk/base/src/notifier/glib.py
trunk/base/test/glib.py
Modified:
trunk/base/src/notifier/__init__.py
Modified: trunk/base/src/notifier/__init__.py
==============================================================================
--- trunk/base/src/notifier/__init__.py (original)
+++ trunk/base/src/notifier/__init__.py Sun Mar 2 11:49:40 2008
@@ -61,5 +61,5 @@
# process management
from popen import Process
-# special glib thread support
-from glib import GOBJECT, gobject_set_threaded
+# special gobject thread support
+from gobject import GOBJECT, gobject_set_threaded
Copied: trunk/base/src/notifier/gobject.py (from r3142,
/trunk/base/src/notifier/glib.py)
==============================================================================
--- /trunk/base/src/notifier/glib.py (original)
+++ trunk/base/src/notifier/gobject.py Sun Mar 2 11:49:40 2008
@@ -43,12 +43,15 @@
# python imports
import threading
+# get import helper since this file conflicts with the
+# global gobject module.
+from kaa.utils import importhelper
try:
# try to import gobject
- import gobject
+ gobject = importhelper('gobject')
except ImportError:
gobject = None
-
+
# get notifier thread module
import thread as thread_support
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
