From 3d24a106ba35fffe2d078d13239398c28686f380 Mon Sep 17 00:00:00 2001 From: jvr Date: Sun, 24 Aug 2003 19:52:03 +0000 Subject: [PATCH] don't use macfs, it's deprecated git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@416 4cde692c-a291-49d1-8350-778aa11640f8 --- Lib/fontTools/ttx.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Lib/fontTools/ttx.py b/Lib/fontTools/ttx.py index d41b063a2..9b16d7aa4 100644 --- a/Lib/fontTools/ttx.py +++ b/Lib/fontTools/ttx.py @@ -61,11 +61,10 @@ def usage(): if sys.platform == "darwin" and sys.version_info[:3] == (2, 2, 0): - # the macfs module shipping with Jaguar's Python 2.2 is too - # broken to be of any use - have_broken_macfs = 1 + # the Mac support of Jaguar's Python 2.2 is broken + have_broken_macsupport = 1 else: - have_broken_macfs = 0 + have_broken_macsupport = 0 numberAddedRE = re.compile("(.*)#\d+$") @@ -182,13 +181,13 @@ def guessFileType(fileName): f = open(fileName, "rb") except IOError: return None - if not have_broken_macfs: + if not have_broken_macsupport: try: - import macfs + import MacOS except ImportError: pass else: - cr, tp = macfs.FSSpec(fileName).GetCreatorType() + cr, tp = MacOS.GetCreatorAndType(fileName) if tp in ("sfnt", "FFIL"): return "TTF" if ext == ".dfont":