[Python-checkins] r78061 - in python/trunk: Doc/library/macostools.rst Lib/test/test_macostools.py

Sun Feb 7 12:38:28 CET 2010

Author: ronald.oussoren
Date: Sun Feb 7 12:38:28 2010
New Revision: 78061
Log:
A number of APIs in macostools cannot work in 64-bit mode because they
use Carbon APIs that aren't available there.
This patch disables tests for the affected entrypoints in macostools and
mentions this in the documentation.
In theory it is possible to replace the implementation by code that does
work in 64-bit mode, but that would require further updates to the Carbon
wrappers because the modern APIs aren't wrapped properly.
Modified:
 python/trunk/Doc/library/macostools.rst
 python/trunk/Lib/test/test_macostools.py
Modified: python/trunk/Doc/library/macostools.rst
==============================================================================

--- python/trunk/Doc/library/macostools.rst	(original)
+++ python/trunk/Doc/library/macostools.rst	Sun Feb 7 12:38:28 2010
@@ -17,6 +17,8 @@
 
 This module has been removed in Python 3.0.
 
+
+
 The :mod:`macostools` module defines the following functions:
 
 
@@ -28,17 +30,30 @@
 modification and backup times (default is to copy them). Custom icons, comments
 and icon position are not copied.
 
+ .. note::
+
+ This function does not work in 64-bit code because it uses APIs that
+ are not available in 64-bit mode.
 
 .. function:: copytree(src, dst)
 
 Recursively copy a file tree from *src* to *dst*, creating folders as needed.
 *src* and *dst* should be specified as pathnames.
 
+ .. note::
+
+ This function does not work in 64-bit code because it uses APIs that
+ are not available in 64-bit mode.
 
 .. function:: mkalias(src, dst)
 
 Create a finder alias *dst* pointing to *src*.
 
+ .. note::
+
+ This function does not work in 64-bit code because it uses APIs that
+ are not available in 64-bit mode.
+
 
 .. function:: touched(dst)
 
Modified: python/trunk/Lib/test/test_macostools.py
==============================================================================
--- python/trunk/Lib/test/test_macostools.py	(original)
+++ python/trunk/Lib/test/test_macostools.py	Sun Feb 7 12:38:28 2010
@@ -59,37 +59,39 @@
 DeprecationWarning)
 macostools.touched(test_support.TESTFN)
 
- def test_copy(self):
- try:
- os.unlink(TESTFN2)
- except:
- pass
- macostools.copy(test_support.TESTFN, TESTFN2)
- self.assertEqual(self.compareData(), '')
-
- def test_mkalias(self):
- try:
- os.unlink(TESTFN2)
- except:
- pass
- macostools.mkalias(test_support.TESTFN, TESTFN2)
- fss, _, _ = Carbon.File.ResolveAliasFile(TESTFN2, 0)
- self.assertEqual(fss.as_pathname(), os.path.realpath(test_support.TESTFN))
-
- def test_mkalias_relative(self):
- try:
- os.unlink(TESTFN2)
- except:
- pass
- # If the directory doesn't exist, then chances are this is a new
- # install of Python so don't create it since the user might end up
- # running ``sudo make install`` and creating the directory here won't
- # leave it with the proper permissions.
- if not os.path.exists(sys.prefix):
- return
- macostools.mkalias(test_support.TESTFN, TESTFN2, sys.prefix)
- fss, _, _ = Carbon.File.ResolveAliasFile(TESTFN2, 0)
- self.assertEqual(fss.as_pathname(), os.path.realpath(test_support.TESTFN))
+ if sys.maxint < 2**32:
+ def test_copy(self):
+ try:
+ os.unlink(TESTFN2)
+ except:
+ pass
+ macostools.copy(test_support.TESTFN, TESTFN2)
+ self.assertEqual(self.compareData(), '')
+
+ if sys.maxint < 2**32:
+ def test_mkalias(self):
+ try:
+ os.unlink(TESTFN2)
+ except:
+ pass
+ macostools.mkalias(test_support.TESTFN, TESTFN2)
+ fss, _, _ = Carbon.File.ResolveAliasFile(TESTFN2, 0)
+ self.assertEqual(fss.as_pathname(), os.path.realpath(test_support.TESTFN))
+
+ def test_mkalias_relative(self):
+ try:
+ os.unlink(TESTFN2)
+ except:
+ pass
+ # If the directory doesn't exist, then chances are this is a new
+ # install of Python so don't create it since the user might end up
+ # running ``sudo make install`` and creating the directory here won't
+ # leave it with the proper permissions.
+ if not os.path.exists(sys.prefix):
+ return
+ macostools.mkalias(test_support.TESTFN, TESTFN2, sys.prefix)
+ fss, _, _ = Carbon.File.ResolveAliasFile(TESTFN2, 0)
+ self.assertEqual(fss.as_pathname(), os.path.realpath(test_support.TESTFN))
 
 
 def test_main():
