Author: dmeyer
Date: Sat Mar 11 19:19:35 2006
New Revision: 1271
Modified:
trunk/WIP/thumb2/src/thumbnail.py
trunk/base/src/__init__.py
trunk/base/src/notifier/decorators.py
trunk/canvas/src/canvas.py
trunk/canvas/src/object.py
Log:
fix name conflict with weakref as module and function
Modified: trunk/WIP/thumb2/src/thumbnail.py
==============================================================================
--- trunk/WIP/thumb2/src/thumbnail.py (original)
+++ trunk/WIP/thumb2/src/thumbnail.py Sat Mar 11 19:19:35 2006
@@ -40,7 +40,8 @@
import logging
# kaa imports
-from kaa import ipc, weakref
+from kaa import ipc
+from kaa.weakref import weakref
from kaa.notifier import Signal, step
# kaa.thumb imports
Modified: trunk/base/src/__init__.py
==============================================================================
--- trunk/base/src/__init__.py (original)
+++ trunk/base/src/__init__.py Sat Mar 11 19:19:35 2006
@@ -7,9 +7,6 @@
# import some basic notifier functions
from kaa.notifier import signals, loop as main, shutdown
-# weakref
-from weakref import weakref
-
# strutils
import strutils
Modified: trunk/base/src/notifier/decorators.py
==============================================================================
--- trunk/base/src/notifier/decorators.py (original)
+++ trunk/base/src/notifier/decorators.py Sat Mar 11 19:19:35 2006
@@ -34,7 +34,7 @@
# notifier thread imports
from thread import MainThreadCallback, is_mainthread
from jobserver import ThreadCallback
-from kaa import weakref
+from kaa.weakref import weakref
def execute_in_timer(timer, interval, type=''):
"""
Modified: trunk/canvas/src/canvas.py
==============================================================================
--- trunk/canvas/src/canvas.py (original)
+++ trunk/canvas/src/canvas.py Sat Mar 11 19:19:35 2006
@@ -4,7 +4,7 @@
import _weakref
import kaa
import logging
-from kaa import weakref
+from kaa.weakref import weakref
from kaa.notifier import Signal, WeakCallback
from container import *
try:
Modified: trunk/canvas/src/object.py
==============================================================================
--- trunk/canvas/src/object.py (original)
+++ trunk/canvas/src/object.py Sat Mar 11 19:19:35 2006
@@ -3,7 +3,7 @@
import types, re
import _weakref
from kaa import evas
-from kaa import weakref
+from kaa.weakref import weakref
from kaa.notifier import Signal
import animation
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
