Revision: 4239
Author: spielmann.robert
Date: Mon Oct 4 16:09:32 2010
Log: I think this should fix the problem with the two unwanted
documentation entries. Regenerated docs show that the entries are gone.
Update issue 677
Status: Review
http://code.google.com/p/robotframework/source/detail?r=4239
Modified:
/trunk/src/robot/libraries/Dialogs.py
=======================================
--- /trunk/src/robot/libraries/Dialogs.py Fri Sep 24 05:20:36 2010
+++ /trunk/src/robot/libraries/Dialogs.py Mon Oct 4 16:09:32 2010
@@ -26,11 +26,11 @@
import sys
try:
- from robot.version import get_version
+ from robot.version import get_version as _get_version
except ImportError:
__version__ = 'unknown'
else:
- __version__ = get_version()
+ __version__ = _get_version()
DIALOG_TITLE = 'Robot Framework'
@@ -83,12 +83,12 @@
BOTH, END, LEFT
import tkMessageBox
import tkSimpleDialog
- from threading import currentThread
+ from threading import currentThread as _currentThread
def _prevent_execution_with_timeouts(method):
def _check_timeout(*args):
- if 'linux' not in sys.platform and
currentThread().getName() != 'MainThread':
+ if 'linux' not in sys.platform and
_currentThread().getName() != 'MainThread':
raise AssertionError("Dialogs library is not supported
with timeouts " +
"on Python on this platform.")
return method(*args)
