[commits] (stearns) [16059] Merge from trunk, r16046:16058

[commits]

Title: [commits] (stearns) [16059] Merge from trunk, r16046:16058

Revision

16059

Author

stearns

Date

2007-12-06 10:53:44 -0800 (Thu, 06 Dec 2007)

Log Message

Merge from trunk, r16046:16058

Modified Paths

• branches/detail_layout/chandler/Makefile
• branches/detail_layout/chandler/parcels/osaf/framework/script_recording/script_lib.py

Added Paths

• branches/detail_layout/chandler/tools/cats/recorded_scripts/TestSwitchViews.py

Diff

Modified: branches/detail_layout/chandler/Makefile (16058 => 16059)

--- branches/detail_layout/chandler/Makefile	2007-12-06 18:10:24 UTC (rev 16058)
+++ branches/detail_layout/chandler/Makefile	2007-12-06 18:53:44 UTC (rev 16059)
@@ -135,7 +135,7 @@
     $(OPENSSL) \
     $(OPENJDK) \
     $(CHANDLERARCHIVES)/m2crypto-$(SNAP)-0.18.2-$(BP)2.tar.gz \
-    $(CHANDLERARCHIVES)/PyICU-$(SNAP)-0.8-87-$(BP)1.tar.gz \
+    $(CHANDLERARCHIVES)/PyICU-$(SNAP)-0.8-91-$(BP)1.tar.gz \
     $(CHANDLERARCHIVES)/PyLucene-$(SNAP)-2.2.0-2-367-$(BP)1.tar.gz \
     $(CHANDLERARCHIVES)/twisted-$(SNAP)-r18795-$(BP)3.tar.gz \
     $(CHANDLERARCHIVES)/wxPython-$(SNAP)-2.8.6.1-r198-$(BP)2.tar.gz \

Modified: branches/detail_layout/chandler/parcels/osaf/framework/script_recording/script_lib.py (16058 => 16059)

--- branches/detail_layout/chandler/parcels/osaf/framework/script_recording/script_lib.py	2007-12-06 18:10:24 UTC (rev 16058)
+++ branches/detail_layout/chandler/parcels/osaf/framework/script_recording/script_lib.py	2007-12-06 18:53:44 UTC (rev 16059)
@@ -200,7 +200,7 @@
                 focusWindow = wx.Window.FindFocus()
                 if focusWindow is not sentToWidget:
                     if isinstance (focusWindow, wx.Window):
-                        focusWindowName = window.GetName()
+                        focusWindowName = focusWindow.GetName()
                     else:
                         focusWindowName = ""
                     assert False, \

Copied: branches/detail_layout/chandler/tools/cats/recorded_scripts/TestSwitchViews.py (from rev 16058, trunk/chandler/tools/cats/recorded_scripts/TestSwitchViews.py) ( => )

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits