diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-02-21 23:18:48 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-02-21 23:18:48 (GMT) |
| commit | d9bb1a0b01c65e7c8eecb5024ee58d91f967e2e4 (patch) | |
| tree | 37de5aa10c51ca9cc9b005f64f51a3fd28e70ecd | |
| parent | 8cb1ff5e8b2b0b66629667842b693a756d0b17af (diff) | |
| download | cpython-d9bb1a0b01c65e7c8eecb5024ee58d91f967e2e4.zip cpython-d9bb1a0b01c65e7c8eecb5024ee58d91f967e2e4.tar.gz cpython-d9bb1a0b01c65e7c8eecb5024ee58d91f967e2e4.tar.bz2 | |
Getting rid of macfs.
| -rw-r--r-- | Lib/plat-mac/EasyDialogs.py | 6 | ||||
| -rw-r--r-- | Lib/plat-mac/PixMapWrapper.py | 7 | ||||
| -rw-r--r-- | Lib/plat-mac/ic.py | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/Lib/plat-mac/EasyDialogs.py b/Lib/plat-mac/EasyDialogs.py index 777315d..d9ebaa9 100644 --- a/Lib/plat-mac/EasyDialogs.py +++ b/Lib/plat-mac/EasyDialogs.py @@ -768,7 +768,7 @@ def AskFolder( def test(): - import time, macfs + import time Message("Testing EasyDialogs.") optionlist = (('v', 'Verbose'), ('verbose', 'Verbose as long option'), @@ -789,9 +789,9 @@ def test(): Message("Hello everybody!!\nThe secret nickname of %s is %s!!!"%(s, s2)) else: s = 'Anonymous' - rv = AskFileForOpen(message="Gimme a file, %s"%s, wanted=macfs.FSSpec) + rv = AskFileForOpen(message="Gimme a file, %s"%s, wanted=Carbon.File.FSSpec) Message("rv: %s"%rv) - rv = AskFileForSave(wanted=macfs.FSSpec, savedFileName="%s.txt"%s) + rv = AskFileForSave(wanted=Carbon.File.FSRef, savedFileName="%s.txt"%s) Message("rv.as_pathname: %s"%rv.as_pathname()) rv = AskFolder() Message("Folder name: %s"%rv) diff --git a/Lib/plat-mac/PixMapWrapper.py b/Lib/plat-mac/PixMapWrapper.py index bcd3e07..01973e8 100644 --- a/Lib/plat-mac/PixMapWrapper.py +++ b/Lib/plat-mac/PixMapWrapper.py @@ -204,11 +204,10 @@ class PixMapWrapper: def test(): import MacOS - import macfs + import EasyDialogs import Image - fsspec, ok = macfs.PromptGetFile("Image File:") - if not ok: return - path = fsspec.as_pathname() + path = EasyDialogs.AskFileForOpen("Image File:") + if not path: return pm = PixMapWrapper() pm.fromImage( Image.open(path) ) pm.blit(20,20) diff --git a/Lib/plat-mac/ic.py b/Lib/plat-mac/ic.py index ff3c571..91e14f3 100644 --- a/Lib/plat-mac/ic.py +++ b/Lib/plat-mac/ic.py @@ -6,7 +6,6 @@ import sys import os from Carbon import Res import Carbon.File -import macfs import macostools error=icglue.error |