[Python-checkins] r68160 - in python/trunk: Lib/plat-mac/EasyDialogs.py Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Fri Jan  2 15:52:09 2009
New Revision: 68160

Log:
Fix for issue r1737832


Modified:
   python/trunk/Lib/plat-mac/EasyDialogs.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/plat-mac/EasyDialogs.py
==============================================================================
--- python/trunk/Lib/plat-mac/EasyDialogs.py	(original)
+++ python/trunk/Lib/plat-mac/EasyDialogs.py	Fri Jan  2 15:52:09 2009
@@ -573,7 +573,7 @@
         del d
 
 def _process_Nav_args(dftflags, **args):
-    import aepack
+    import Carbon.AppleEvents
     import Carbon.AE
     import Carbon.File
     for k in args.keys():
@@ -585,11 +585,14 @@
     if args.has_key('defaultLocation') and \
             not isinstance(args['defaultLocation'], Carbon.AE.AEDesc):
         defaultLocation = args['defaultLocation']
-        if isinstance(defaultLocation, (Carbon.File.FSSpec, Carbon.File.FSRef)):
-            args['defaultLocation'] = aepack.pack(defaultLocation)
+        if isinstance(defaultLocation, Carbon.File.FSSpec):
+            args['defaultLocation'] = Carbon.AE.AECreateDesc(
+                    Carbon.AppleEvents.typeFSS, defaultLocation.data)
         else:
-            defaultLocation = Carbon.File.FSRef(defaultLocation)
-            args['defaultLocation'] = aepack.pack(defaultLocation)
+            if not isinstance(defaultLocation, Carbon.File.FSRef):
+                defaultLocation = Carbon.File.FSRef(defaultLocation)
+            args['defaultLocation'] = Carbon.AE.AECreateDesc(
+                    Carbon.AppleEvents.typeFSRef, defaultLocation.data)
     if args.has_key('typeList') and not isinstance(args['typeList'], Carbon.Res.ResourceType):
         typeList = args['typeList'][:]
         # Workaround for OSX typeless files:

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Fri Jan  2 15:52:09 2009
@@ -232,6 +232,9 @@
 
 - Issue #16278952: plat-mac/videoreader.py now correctly imports MediaDescr
 
+- Issue #1737832 : plat-mac/EasyDialog.py no longer uses the broken aepack
+  module.
+
 Tools/Demos
 -----------