[Python-checkins] python/dist/src/Mac/Tools/IDE MacPrefs.py,1.5,1.6 ProfileBrowser.py,1.4,1.5 PyBrowser.py,1.21,1.22 PyConsole.py,1.14,1.15 PyDocSearch.py,1.10,1.11 PyEdit.py,1.34,1.35 PythonIDEMain.py,1.26,1.27 Wapplication.py,1.20,1.21 Wquicktime.py,1.4,1.5
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Thu, 06 Feb 2003 14:32:41 -0800
Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory sc8-pr-cvs1:/tmp/cvs-serv8695
Modified Files:
MacPrefs.py ProfileBrowser.py PyBrowser.py PyConsole.py
PyDocSearch.py PyEdit.py PythonIDEMain.py Wapplication.py
Wquicktime.py
Log Message:
Got rid of macfs and FSSpecs in general (pathnames or FSRefs are now
used everywhere).
Index: MacPrefs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/MacPrefs.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MacPrefs.py 13 Dec 2002 23:32:51 -0000 1.5
--- MacPrefs.py 6 Feb 2003 22:32:35 -0000 1.6
***************
*** 1,7 ****
- import macfs
import marshal
import types
!
! from MACFS import kOnSystemDisk
class PrefObject:
--- 1,6 ----
import marshal
import types
! from Carbon import Folder
! from Carbon import Folders
class PrefObject:
***************
*** 72,77 ****
marshal.dump(prefdict, open(self.__path, 'wb'))
try:
! fss = macfs.FSSpec(macfs.FSRef(self.__path))
! fss.SetCreatorType(self.__creator, 'pref')
except:
pass
--- 71,75 ----
marshal.dump(prefdict, open(self.__path, 'wb'))
try:
! MacOS.SetCreatorAndType(self.__path, self.__creator, 'pref')
except:
pass
***************
*** 99,105 ****
return _prefscache[prefname]
# Find the preferences folder and our prefs file, create if needed.
! vrefnum, dirid = macfs.FindFolder(kOnSystemDisk, 'pref', 0)
! prefsfolder_fss = macfs.FSSpec((vrefnum, dirid, ''))
! prefsfolder = macfs.FSRef(prefsfolder_fss).as_fsspec().as_pathname()
path = os.path.join(prefsfolder, prefname)
head, tail = os.path.split(path)
--- 97,102 ----
return _prefscache[prefname]
# Find the preferences folder and our prefs file, create if needed.
! fsr = Folder.FSFindFolder(Folders.kOnSystemDisk, 'pref', 1)
! prefsfolder = fsr.as_pathname()
path = os.path.join(prefsfolder, prefname)
head, tail = os.path.split(path)
Index: ProfileBrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/ProfileBrowser.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ProfileBrowser.py 26 Jan 2003 22:15:48 -0000 1.4
--- ProfileBrowser.py 6 Feb 2003 22:32:35 -0000 1.5
***************
*** 84,88 ****
browser = ProfileBrowser(stats)
else:
- import macfs
filename = EasyDialogs.AskFileForOpen(message='Profiler data')
if not filename: sys.exit(0)
--- 84,87 ----
Index: PyBrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PyBrowser.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** PyBrowser.py 13 Dec 2002 15:14:22 -0000 1.21
--- PyBrowser.py 6 Feb 2003 22:32:35 -0000 1.22
***************
*** 323,329 ****
return
elif os.path.exists(value) and os.path.isfile(value):
! import macfs
! fss = macfs.FSSpec(value)
! if fss.GetCreatorType()[1] == 'TEXT':
W.getapplication().openscript(value)
--- 323,327 ----
return
elif os.path.exists(value) and os.path.isfile(value):
! if MacOS.GetCreatorAndType(value)[1] in ('TEXT', '\0\0\0\0'):
W.getapplication().openscript(value)
Index: PyConsole.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PyConsole.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PyConsole.py 26 Jan 2003 22:15:48 -0000 1.14
--- PyConsole.py 6 Feb 2003 22:32:35 -0000 1.15
***************
*** 86,90 ****
def domenu_save_as(self, *args):
- import macfs
filename = EasyDialogs.AskFileForSave(message='Save console text as:',
savedFileName='console.txt')
--- 86,89 ----
***************
*** 94,98 ****
f.write(self.get())
f.close()
! fss.SetCreatorType(W._signature, 'TEXT')
def write(self, text):
--- 93,97 ----
f.write(self.get())
f.close()
! MacOS.SetCreatorAndType(filename, W._signature, 'TEXT')
def write(self, text):
***************
*** 243,247 ****
def domenu_save_as(self, *args):
title = self._parentwindow.gettitle()
- import macfs
filename = EasyDialogs.AskFileForSave(message='Save %s text as:' % title,
savedFileName=title + '.txt')
--- 242,245 ----
***************
*** 251,255 ****
f.write(self.get())
f.close()
! fss.SetCreatorType(W._signature, 'TEXT')
def domenu_cut(self, *args):
--- 249,253 ----
f.write(self.get())
f.close()
! MacOS.SetCreatorAndType(filename, W._signature, 'TEXT')
def domenu_cut(self, *args):
Index: PyDocSearch.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PyDocSearch.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PyDocSearch.py 26 Jan 2003 22:15:48 -0000 1.10
--- PyDocSearch.py 6 Feb 2003 22:32:35 -0000 1.11
***************
*** 1,5 ****
import re
import W
- import macfs
import os
import MacPrefs
--- 1,4 ----
Index: PyEdit.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PyEdit.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** PyEdit.py 26 Jan 2003 22:15:48 -0000 1.34
--- PyEdit.py 6 Feb 2003 22:32:35 -0000 1.35
***************
*** 5,10 ****
from Wkeys import *
- import macfs
- import MACFS
import MacOS
import EasyDialogs
--- 5,8 ----
***************
*** 13,16 ****
--- 11,15 ----
from Carbon import Evt
from Carbon import Qd
+ from Carbon import File
import os
import imp
***************
*** 20,23 ****
--- 19,24 ----
import re
+ smAllScripts = -3
+
if hasattr(Win, "FrontNonFloatingWindow"):
MyFrontWindow = Win.FrontNonFloatingWindow
***************
*** 62,67 ****
text = f.read()
f.close()
! fss = macfs.FSSpec(path)
! self._creator, filetype = fss.GetCreatorType()
else:
raise IOError, "file '%s' does not exist" % path
--- 63,67 ----
text = f.read()
f.close()
! self._creator, filetype = MacOS.GetCreatorAndType(path)
else:
raise IOError, "file '%s' does not exist" % path
***************
*** 135,139 ****
resref = Res.FSpOpenResFile(self.path, 3)
except Res.Error:
! Res.FSpCreateResFile(self.path, self._creator, 'TEXT', MACFS.smAllScripts)
resref = Res.FSpOpenResFile(self.path, 3)
try:
--- 135,139 ----
resref = Res.FSpOpenResFile(self.path, 3)
except Res.Error:
! Res.FSpCreateResFile(self.path, self._creator, 'TEXT', smAllScripts)
resref = Res.FSpOpenResFile(self.path, 3)
try:
***************
*** 390,395 ****
fp.write(data)
fp.close()
! fss = macfs.FSSpec(self.path)
! fss.SetCreatorType(self._creator, 'TEXT')
self.getsettings()
self.writewindowsettings()
--- 390,394 ----
fp.write(data)
fp.close()
! MacOS.SetCreatorAndType(self.path, self._creator, 'TEXT')
self.getsettings()
self.writewindowsettings()
***************
*** 420,425 ****
if hasattr(app, 'makescriptsmenu'):
app = W.getapplication()
! fss, fss_changed = app.scriptsfolder.Resolve()
! path = fss.as_pathname()
if path == self.path[:len(path)]:
W.getapplication().makescriptsmenu()
--- 419,424 ----
if hasattr(app, 'makescriptsmenu'):
app = W.getapplication()
! fsr, changed = app.scriptsfolder.FSResolveAlias(None)
! path = fsr.as_pathname()
if path == self.path[:len(path)]:
W.getapplication().makescriptsmenu()
***************
*** 547,558 ****
file_path = self.path
if not os.path.exists(interp_path):
! # This "can happen" if we are running IDE under MacPython. Try
! # the standard location.
! interp_path = "/Library/Frameworks/Python.framework/Versions/2.3/bin/python"
! try:
! fsr = macfs.FSRef(interp_path)
! except macfs.Error:
! raise W.AlertError, "Can't find command-line Python"
! file_path = macfs.FSRef(macfs.FSSpec(self.path)).as_pathname()
cmd = '"%s" "%s" ; exit' % (interp_path, file_path)
t = Terminal.Terminal()
--- 546,551 ----
file_path = self.path
if not os.path.exists(interp_path):
! # This "can happen" if we are running IDE under MacPython-OS9.
! raise W.AlertError, "Can't find command-line Python"
cmd = '"%s" "%s" ; exit' % (interp_path, file_path)
t = Terminal.Terminal()
***************
*** 1369,1374 ****
def resolvealiases(path):
try:
! return macfs.ResolveAliasFile(path)[0].as_pathname()
! except (macfs.error, ValueError), (error, str):
if error <> -120:
raise
--- 1362,1369 ----
def resolvealiases(path):
try:
! fsr, d1, d2 = File.FSResolveAliasFile(path, 1)
! path = fsr.as_pathname()
! return path
! except (File.Error, ValueError), (error, str):
if error <> -120:
raise
Index: PythonIDEMain.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PythonIDEMain.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** PythonIDEMain.py 5 Feb 2003 15:41:09 -0000 1.26
--- PythonIDEMain.py 6 Feb 2003 22:32:35 -0000 1.27
***************
*** 8,14 ****
import os
import sys
- import macfs
import MacOS
import EasyDialogs
if MacOS.runtimemodel == 'macho':
--- 8,15 ----
import os
import sys
import MacOS
import EasyDialogs
+ from Carbon import File
+ from Carbon import Files
if MacOS.runtimemodel == 'macho':
***************
*** 24,27 ****
--- 25,32 ----
return not not value
+ def getmodtime(file):
+ file = File.FSRef(file)
+ catinfo, d1, d2, d3 = file.FSGetCatalogInfo(Files.kFSCatInfoContentMod)
+ return catinfo.contentModDate
class PythonIDE(Wapplication.Application):
***************
*** 126,133 ****
prefs = self.getprefs()
try:
! fss, fss_changed = macfs.RawAlias(prefs.scriptsfolder).Resolve()
! self.scriptsfolder = fss.NewAlias()
except:
! path = os.path.join(os.getcwd(), ":Mac:IDE scripts")
if not os.path.exists(path):
path = os.path.join(os.getcwd(), "Scripts")
--- 131,138 ----
prefs = self.getprefs()
try:
! fsr, d = File.Alias(rawdata=prefs.scriptsfolder).FSResolveAlias(None)
! self.scriptsfolder = fsr.FSNewAliasMinimal()
except:
! path = os.path.join(os.getcwd(), "Mac", "IDE scripts")
if not os.path.exists(path):
path = os.path.join(os.getcwd(), "Scripts")
***************
*** 136,144 ****
f = open(os.path.join(path, "Place your scripts here"+ELIPSES), "w")
f.close()
! fss = macfs.FSSpec(path)
! self.scriptsfolder = fss.NewAlias()
! self.scriptsfoldermodtime = fss.GetDates()[1]
else:
! self.scriptsfoldermodtime = fss.GetDates()[1]
prefs.scriptsfolder = self.scriptsfolder.data
self._scripts = {}
--- 141,149 ----
f = open(os.path.join(path, "Place your scripts here"+ELIPSES), "w")
f.close()
! fsr = File.FSRef(path)
! self.scriptsfolder = fsr.FSNewAliasMinimal()
! self.scriptsfoldermodtime = getmodtime(fsr)
else:
! self.scriptsfoldermodtime = getmodtime(fsr)
prefs.scriptsfolder = self.scriptsfolder.data
self._scripts = {}
***************
*** 154,160 ****
def suspendresume(self, onoff):
if onoff:
! fss, fss_changed = self.scriptsfolder.Resolve()
! modtime = fss.GetDates()[1]
! if self.scriptsfoldermodtime <> modtime or fss_changed:
self.scriptsfoldermodtime = modtime
W.SetCursor('watch')
--- 159,165 ----
def suspendresume(self, onoff):
if onoff:
! fsr, changed = self.scriptsfolder.FSResolveAlias(None)
! modtime = getmodtime(fsr)
! if self.scriptsfoldermodtime <> modtime or changed:
self.scriptsfoldermodtime = modtime
W.SetCursor('watch')
***************
*** 172,181 ****
docs = [docs]
for doc in docs:
! fss, a = doc.Resolve()
! path = fss.as_pathname()
self.opendoc(path)
def opendoc(self, path):
! fcreator, ftype = macfs.FSSpec(path).GetCreatorType()
if ftype == 'TEXT':
self.openscript(path)
--- 177,186 ----
docs = [docs]
for doc in docs:
! fsr, a = doc.FSResolveAlias(None)
! path = fsr.as_pathname()
self.opendoc(path)
def opendoc(self, path):
! fcreator, ftype = MacOS.GetCreatorAndType(path)
if ftype == 'TEXT':
self.openscript(path)
***************
*** 192,200 ****
def do_setscriptsfolder(self, *args):
! fss = EasyDialogs.AskFolder(message="Select Scripts Folder",
! wanted=macfs.FSSpec)
! if fss:
prefs = self.getprefs()
! alis = fss.NewAlias()
prefs.scriptsfolder = alis.data
self.scriptsfolder = alis
--- 197,205 ----
def do_setscriptsfolder(self, *args):
! fsr = EasyDialogs.AskFolder(message="Select Scripts Folder",
! wanted=File.FSRef)
! if fsr:
prefs = self.getprefs()
! alis = fsr.FSNewAliasMinimal()
prefs.scriptsfolder = alis.data
self.scriptsfolder = alis
***************
*** 247,252 ****
#FrameWork.MenuItem(self.scriptsmenu, "New script", None, self.domenu_new)
#self.scriptsmenu.addseparator()
! fss, fss_changed = self.scriptsfolder.Resolve()
! self.scriptswalk(fss.as_pathname(), self.scriptsmenu)
def makeopenwindowsmenu(self):
--- 252,257 ----
#FrameWork.MenuItem(self.scriptsmenu, "New script", None, self.domenu_new)
#self.scriptsmenu.addseparator()
! fsr, d1 = self.scriptsfolder.FSResolveAlias(None)
! self.scriptswalk(fsr.as_pathname(), self.scriptsmenu)
def makeopenwindowsmenu(self):
Index: Wapplication.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/Wapplication.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Wapplication.py 9 Jan 2003 23:20:31 -0000 1.20
--- Wapplication.py 6 Feb 2003 22:32:35 -0000 1.21
***************
*** 9,12 ****
--- 9,13 ----
from Carbon import Menu; MenuToolbox = Menu; del Menu
import macresource
+ from Carbon import File
if hasattr(Win, "FrontNonFloatingWindow"):
***************
*** 274,278 ****
return
done[top] = 1
! import os, macfs, string
try:
names = os.listdir(top)
--- 275,279 ----
return
done[top] = 1
! import os, string
try:
names = os.listdir(top)
***************
*** 286,294 ****
continue
try:
! fss, isdir, isalias = macfs.ResolveAliasFile(name)
except:
# maybe a broken alias
continue
! path = fss.as_pathname()
if done.has_key(path):
continue
--- 287,295 ----
continue
try:
! fsr, isdir, isalias = File.FSResolveAliasFile(name, 1)
except:
# maybe a broken alias
continue
! path = fsr.as_pathname()
if done.has_key(path):
continue
***************
*** 302,306 ****
self.scriptswalk(path, submenu, done)
else:
! creator, type = fss.GetCreatorType()
if type == 'TEXT':
if name[-3:] == '.py':
--- 303,307 ----
self.scriptswalk(path, submenu, done)
else:
! creator, type = MacOS.GetCreatorAndType(path)
if type == 'TEXT':
if name[-3:] == '.py':
Index: Wquicktime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/Wquicktime.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Wquicktime.py 25 Aug 2001 12:14:38 -0000 1.4
--- Wquicktime.py 6 Feb 2003 22:32:35 -0000 1.5
***************
*** 4,8 ****
from Carbon import Qt, QuickTime
import W
! import macfs
from Carbon import Evt, Events
--- 4,8 ----
from Carbon import Qt, QuickTime
import W
! from Carbon import File
from Carbon import Evt, Events
***************
*** 34,45 ****
#self.GetWindow().InvalWindowRect(self.movie.GetMovieBox())
Qd.PaintRect(self.movie.GetMovieBox())
! if type(path_or_fss) == type(''):
! path = path_or_fss
! fss = macfs.FSSpec(path)
! else:
! path = path_or_fss.as_pathname()
! fss = path_or_fss
self.movietitle = os.path.basename(path)
! movieResRef = Qt.OpenMovieFile(fss, 1)
self.movie, dummy, dummy = Qt.NewMovieFromFile(movieResRef, 0, QuickTime.newMovieActive)
self.moviebox = self.movie.GetMovieBox()
--- 34,40 ----
#self.GetWindow().InvalWindowRect(self.movie.GetMovieBox())
Qd.PaintRect(self.movie.GetMovieBox())
! path = File.pathname(path)
self.movietitle = os.path.basename(path)
! movieResRef = Qt.OpenMovieFile(path_or_fss, 1)
self.movie, dummy, dummy = Qt.NewMovieFromFile(movieResRef, 0, QuickTime.newMovieActive)
self.moviebox = self.movie.GetMovieBox()