1995-04-05 06:18:35 -03:00
|
|
|
"""Easy to use dialogs.
|
|
|
|
|
|
|
|
Message(msg) -- display a message and an OK button.
|
|
|
|
AskString(prompt, default) -- ask for a string, display OK and Cancel buttons.
|
1999-02-14 20:04:05 -04:00
|
|
|
AskPassword(prompt, default) -- like AskString(), but shows text as bullets.
|
1995-04-05 06:18:35 -03:00
|
|
|
AskYesNoCancel(question, default) -- display a question and Yes, No and Cancel buttons.
|
2003-01-21 10:38:32 -04:00
|
|
|
GetArgv(optionlist, commandlist) -- fill a sys.argv-like list using a dialog
|
2003-04-06 06:01:11 -03:00
|
|
|
AskFileForOpen(...) -- Ask the user for an existing file
|
2003-01-21 10:38:32 -04:00
|
|
|
AskFileForSave(...) -- Ask the user for an output file
|
|
|
|
AskFolder(...) -- Ask the user to select a folder
|
1995-11-14 06:13:49 -04:00
|
|
|
bar = Progress(label, maxvalue) -- Display a progress bar
|
|
|
|
bar.set(value) -- Set value
|
1997-05-12 12:44:14 -03:00
|
|
|
bar.inc( *amount ) -- increment value by amount (default=1)
|
2003-04-06 06:01:11 -03:00
|
|
|
bar.label( *newlabel ) -- get or set text label.
|
1995-04-05 06:18:35 -03:00
|
|
|
|
|
|
|
More documentation in each function.
|
1999-12-12 18:57:51 -04:00
|
|
|
This module uses DLOG resources 260 and on.
|
1995-04-05 06:18:35 -03:00
|
|
|
Based upon STDWIN dialogs with the same names and functions.
|
|
|
|
"""
|
|
|
|
|
2001-08-25 09:15:04 -03:00
|
|
|
from Carbon.Dlg import GetNewDialog, SetDialogItemText, GetDialogItemText, ModalDialog
|
|
|
|
from Carbon import Qd
|
|
|
|
from Carbon import QuickDraw
|
|
|
|
from Carbon import Dialogs
|
|
|
|
from Carbon import Windows
|
|
|
|
from Carbon import Dlg,Win,Evt,Events # sdm7g
|
|
|
|
from Carbon import Ctl
|
|
|
|
from Carbon import Controls
|
|
|
|
from Carbon import Menu
|
2003-03-03 08:25:02 -04:00
|
|
|
from Carbon import AE
|
2003-01-17 12:04:39 -04:00
|
|
|
import Nav
|
1998-07-01 12:47:44 -03:00
|
|
|
import MacOS
|
2003-04-06 06:01:11 -03:00
|
|
|
from Carbon.ControlAccessor import * # Also import Controls constants
|
2003-01-17 12:04:39 -04:00
|
|
|
import Carbon.File
|
2002-11-07 19:07:05 -04:00
|
|
|
import macresource
|
2003-01-17 19:13:03 -04:00
|
|
|
import os
|
2003-01-26 16:22:41 -04:00
|
|
|
import sys
|
2002-11-07 19:07:05 -04:00
|
|
|
|
2003-01-21 10:38:32 -04:00
|
|
|
__all__ = ['Message', 'AskString', 'AskPassword', 'AskYesNoCancel',
|
2003-06-21 11:41:32 -03:00
|
|
|
'GetArgv', 'AskFileForOpen', 'AskFileForSave', 'AskFolder',
|
|
|
|
'ProgressBar']
|
2003-04-06 06:01:11 -03:00
|
|
|
|
2002-11-07 19:07:05 -04:00
|
|
|
_initialized = 0
|
|
|
|
|
|
|
|
def _initialize():
|
2003-06-21 11:41:32 -03:00
|
|
|
global _initialized
|
|
|
|
if _initialized: return
|
|
|
|
macresource.need("DLOG", 260, "dialogs.rsrc", __name__)
|
2003-04-06 06:01:11 -03:00
|
|
|
|
2003-03-03 08:25:02 -04:00
|
|
|
def _interact():
|
2003-06-21 11:41:32 -03:00
|
|
|
"""Make sure the application is in the foreground"""
|
|
|
|
AE.AEInteractWithUser(50000000)
|
1998-07-01 12:47:44 -03:00
|
|
|
|
|
|
|
def cr2lf(text):
|
2003-06-21 11:41:32 -03:00
|
|
|
if '\r' in text:
|
2007-04-17 05:48:32 -03:00
|
|
|
text = '\n'.join(text.split('\r'))
|
2003-06-21 11:41:32 -03:00
|
|
|
return text
|
1998-07-01 12:47:44 -03:00
|
|
|
|
|
|
|
def lf2cr(text):
|
2003-06-21 11:41:32 -03:00
|
|
|
if '\n' in text:
|
2007-04-17 05:48:32 -03:00
|
|
|
text = '\r'.join(text.split('\n'))
|
2003-06-21 11:41:32 -03:00
|
|
|
if len(text) > 253:
|
|
|
|
text = text[:253] + '\311'
|
|
|
|
return text
|
1995-04-05 06:18:35 -03:00
|
|
|
|
1999-12-12 18:57:51 -04:00
|
|
|
def Message(msg, id=260, ok=None):
|
2003-06-21 11:41:32 -03:00
|
|
|
"""Display a MESSAGE string.
|
|
|
|
|
|
|
|
Return when the user clicks the OK button or presses Return.
|
|
|
|
|
|
|
|
The MESSAGE string can be at most 255 characters long.
|
|
|
|
"""
|
|
|
|
_initialize()
|
|
|
|
_interact()
|
|
|
|
d = GetNewDialog(id, -1)
|
|
|
|
if not d:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("EasyDialogs: Can't get DLOG resource with id =", id, " (missing resource file?)")
|
2003-06-21 11:41:32 -03:00
|
|
|
return
|
|
|
|
h = d.GetDialogItemAsControl(2)
|
|
|
|
SetDialogItemText(h, lf2cr(msg))
|
|
|
|
if ok != None:
|
|
|
|
h = d.GetDialogItemAsControl(1)
|
|
|
|
h.SetControlTitle(ok)
|
|
|
|
d.SetDialogDefaultItem(1)
|
|
|
|
d.AutoSizeDialog()
|
|
|
|
d.GetDialogWindow().ShowWindow()
|
|
|
|
while 1:
|
|
|
|
n = ModalDialog(None)
|
|
|
|
if n == 1:
|
|
|
|
return
|
1995-04-05 06:18:35 -03:00
|
|
|
|
|
|
|
|
1999-12-12 18:57:51 -04:00
|
|
|
def AskString(prompt, default = "", id=261, ok=None, cancel=None):
|
2003-06-21 11:41:32 -03:00
|
|
|
"""Display a PROMPT string and a text entry field with a DEFAULT string.
|
|
|
|
|
|
|
|
Return the contents of the text entry field when the user clicks the
|
|
|
|
OK button or presses Return.
|
|
|
|
Return None when the user clicks the Cancel button.
|
|
|
|
|
|
|
|
If omitted, DEFAULT is empty.
|
|
|
|
|
|
|
|
The PROMPT and DEFAULT strings, as well as the return value,
|
|
|
|
can be at most 255 characters long.
|
|
|
|
"""
|
|
|
|
|
|
|
|
_initialize()
|
|
|
|
_interact()
|
|
|
|
d = GetNewDialog(id, -1)
|
|
|
|
if not d:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("EasyDialogs: Can't get DLOG resource with id =", id, " (missing resource file?)")
|
2003-06-21 11:41:32 -03:00
|
|
|
return
|
|
|
|
h = d.GetDialogItemAsControl(3)
|
|
|
|
SetDialogItemText(h, lf2cr(prompt))
|
|
|
|
h = d.GetDialogItemAsControl(4)
|
|
|
|
SetDialogItemText(h, lf2cr(default))
|
|
|
|
d.SelectDialogItemText(4, 0, 999)
|
2003-04-06 06:01:11 -03:00
|
|
|
# d.SetDialogItem(4, 0, 255)
|
2003-06-21 11:41:32 -03:00
|
|
|
if ok != None:
|
|
|
|
h = d.GetDialogItemAsControl(1)
|
|
|
|
h.SetControlTitle(ok)
|
|
|
|
if cancel != None:
|
|
|
|
h = d.GetDialogItemAsControl(2)
|
|
|
|
h.SetControlTitle(cancel)
|
|
|
|
d.SetDialogDefaultItem(1)
|
|
|
|
d.SetDialogCancelItem(2)
|
|
|
|
d.AutoSizeDialog()
|
|
|
|
d.GetDialogWindow().ShowWindow()
|
|
|
|
while 1:
|
|
|
|
n = ModalDialog(None)
|
|
|
|
if n == 1:
|
|
|
|
h = d.GetDialogItemAsControl(4)
|
|
|
|
return cr2lf(GetDialogItemText(h))
|
|
|
|
if n == 2: return None
|
2003-04-06 06:01:11 -03:00
|
|
|
|
|
|
|
def AskPassword(prompt, default='', id=264, ok=None, cancel=None):
|
2003-06-21 11:41:32 -03:00
|
|
|
"""Display a PROMPT string and a text entry field with a DEFAULT string.
|
|
|
|
The string is displayed as bullets only.
|
|
|
|
|
|
|
|
Return the contents of the text entry field when the user clicks the
|
|
|
|
OK button or presses Return.
|
|
|
|
Return None when the user clicks the Cancel button.
|
|
|
|
|
|
|
|
If omitted, DEFAULT is empty.
|
|
|
|
|
|
|
|
The PROMPT and DEFAULT strings, as well as the return value,
|
|
|
|
can be at most 255 characters long.
|
|
|
|
"""
|
|
|
|
_initialize()
|
|
|
|
_interact()
|
|
|
|
d = GetNewDialog(id, -1)
|
|
|
|
if not d:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("EasyDialogs: Can't get DLOG resource with id =", id, " (missing resource file?)")
|
2003-06-21 11:41:32 -03:00
|
|
|
return
|
|
|
|
h = d.GetDialogItemAsControl(3)
|
|
|
|
SetDialogItemText(h, lf2cr(prompt))
|
|
|
|
pwd = d.GetDialogItemAsControl(4)
|
|
|
|
bullets = '\245'*len(default)
|
2003-04-06 06:01:11 -03:00
|
|
|
## SetControlData(pwd, kControlEditTextPart, kControlEditTextTextTag, bullets)
|
2003-06-21 11:41:32 -03:00
|
|
|
SetControlData(pwd, kControlEditTextPart, kControlEditTextPasswordTag, default)
|
|
|
|
d.SelectDialogItemText(4, 0, 999)
|
|
|
|
Ctl.SetKeyboardFocus(d.GetDialogWindow(), pwd, kControlEditTextPart)
|
|
|
|
if ok != None:
|
|
|
|
h = d.GetDialogItemAsControl(1)
|
|
|
|
h.SetControlTitle(ok)
|
|
|
|
if cancel != None:
|
|
|
|
h = d.GetDialogItemAsControl(2)
|
|
|
|
h.SetControlTitle(cancel)
|
|
|
|
d.SetDialogDefaultItem(Dialogs.ok)
|
|
|
|
d.SetDialogCancelItem(Dialogs.cancel)
|
|
|
|
d.AutoSizeDialog()
|
|
|
|
d.GetDialogWindow().ShowWindow()
|
|
|
|
while 1:
|
|
|
|
n = ModalDialog(None)
|
|
|
|
if n == 1:
|
|
|
|
h = d.GetDialogItemAsControl(4)
|
|
|
|
return cr2lf(GetControlData(pwd, kControlEditTextPart, kControlEditTextPasswordTag))
|
|
|
|
if n == 2: return None
|
1995-04-05 06:18:35 -03:00
|
|
|
|
1999-12-12 18:57:51 -04:00
|
|
|
def AskYesNoCancel(question, default = 0, yes=None, no=None, cancel=None, id=262):
|
2003-06-21 11:41:32 -03:00
|
|
|
"""Display a QUESTION string which can be answered with Yes or No.
|
|
|
|
|
|
|
|
Return 1 when the user clicks the Yes button.
|
|
|
|
Return 0 when the user clicks the No button.
|
|
|
|
Return -1 when the user clicks the Cancel button.
|
|
|
|
|
|
|
|
When the user presses Return, the DEFAULT value is returned.
|
|
|
|
If omitted, this is 0 (No).
|
|
|
|
|
|
|
|
The QUESTION string can be at most 255 characters.
|
|
|
|
"""
|
|
|
|
|
|
|
|
_initialize()
|
|
|
|
_interact()
|
|
|
|
d = GetNewDialog(id, -1)
|
|
|
|
if not d:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("EasyDialogs: Can't get DLOG resource with id =", id, " (missing resource file?)")
|
2003-06-21 11:41:32 -03:00
|
|
|
return
|
|
|
|
# Button assignments:
|
|
|
|
# 1 = default (invisible)
|
|
|
|
# 2 = Yes
|
|
|
|
# 3 = No
|
|
|
|
# 4 = Cancel
|
|
|
|
# The question string is item 5
|
|
|
|
h = d.GetDialogItemAsControl(5)
|
|
|
|
SetDialogItemText(h, lf2cr(question))
|
|
|
|
if yes != None:
|
|
|
|
if yes == '':
|
|
|
|
d.HideDialogItem(2)
|
|
|
|
else:
|
|
|
|
h = d.GetDialogItemAsControl(2)
|
|
|
|
h.SetControlTitle(yes)
|
|
|
|
if no != None:
|
|
|
|
if no == '':
|
|
|
|
d.HideDialogItem(3)
|
|
|
|
else:
|
|
|
|
h = d.GetDialogItemAsControl(3)
|
|
|
|
h.SetControlTitle(no)
|
|
|
|
if cancel != None:
|
|
|
|
if cancel == '':
|
|
|
|
d.HideDialogItem(4)
|
|
|
|
else:
|
|
|
|
h = d.GetDialogItemAsControl(4)
|
|
|
|
h.SetControlTitle(cancel)
|
|
|
|
d.SetDialogCancelItem(4)
|
|
|
|
if default == 1:
|
|
|
|
d.SetDialogDefaultItem(2)
|
|
|
|
elif default == 0:
|
|
|
|
d.SetDialogDefaultItem(3)
|
|
|
|
elif default == -1:
|
|
|
|
d.SetDialogDefaultItem(4)
|
|
|
|
d.AutoSizeDialog()
|
|
|
|
d.GetDialogWindow().ShowWindow()
|
|
|
|
while 1:
|
|
|
|
n = ModalDialog(None)
|
|
|
|
if n == 1: return default
|
|
|
|
if n == 2: return 1
|
|
|
|
if n == 3: return 0
|
|
|
|
if n == 4: return -1
|
2003-04-06 06:01:11 -03:00
|
|
|
|
|
|
|
|
|
|
|
|
1997-05-12 12:44:14 -03:00
|
|
|
|
2002-11-29 20:01:29 -04:00
|
|
|
screenbounds = Qd.GetQDGlobalsScreenBits().bounds
|
1997-05-12 12:44:14 -03:00
|
|
|
screenbounds = screenbounds[0]+4, screenbounds[1]+4, \
|
2003-06-21 11:41:32 -03:00
|
|
|
screenbounds[2]-4, screenbounds[3]-4
|
1997-05-12 12:44:14 -03:00
|
|
|
|
2003-04-06 06:01:11 -03:00
|
|
|
kControlProgressBarIndeterminateTag = 'inde' # from Controls.py
|
2001-08-27 12:24:07 -03:00
|
|
|
|
|
|
|
|
1995-11-14 06:13:49 -04:00
|
|
|
class ProgressBar:
|
2003-06-21 11:41:32 -03:00
|
|
|
def __init__(self, title="Working...", maxval=0, label="", id=263):
|
|
|
|
self.w = None
|
|
|
|
self.d = None
|
|
|
|
_initialize()
|
|
|
|
self.d = GetNewDialog(id, -1)
|
|
|
|
self.w = self.d.GetDialogWindow()
|
|
|
|
self.label(label)
|
|
|
|
self.title(title)
|
|
|
|
self.set(0, maxval)
|
|
|
|
self.d.AutoSizeDialog()
|
|
|
|
self.w.ShowWindow()
|
|
|
|
self.d.DrawDialog()
|
|
|
|
|
Merge the rest of the trunk.
Merged revisions 46490-46494,46496,46498,46500,46506,46521,46538,46558,46563-46567,46570-46571,46583,46593,46595-46598,46604,46606,46609-46753 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46610 | martin.v.loewis | 2006-06-03 09:42:26 +0200 (Sat, 03 Jun 2006) | 2 lines
Updated version (win32-icons2.zip) from #1490384.
........
r46612 | andrew.kuchling | 2006-06-03 20:09:41 +0200 (Sat, 03 Jun 2006) | 1 line
[Bug #1472084] Fix description of do_tag
........
r46614 | andrew.kuchling | 2006-06-03 20:33:35 +0200 (Sat, 03 Jun 2006) | 1 line
[Bug #1475554] Strengthen text to say 'must' instead of 'should'
........
r46616 | andrew.kuchling | 2006-06-03 20:41:28 +0200 (Sat, 03 Jun 2006) | 1 line
[Bug #1441864] Clarify description of 'data' argument
........
r46617 | andrew.kuchling | 2006-06-03 20:43:24 +0200 (Sat, 03 Jun 2006) | 1 line
Minor rewording
........
r46619 | andrew.kuchling | 2006-06-03 21:02:35 +0200 (Sat, 03 Jun 2006) | 9 lines
[Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler.
Fix by renaming the variable.
In a different module, Neal fixed it by renaming _self to self. There's
already a variable named 'self' here, so I used selfptr.
(I'm committing this on a Mac without Tk, but it's a simple search-and-replace.
<crosses fingers>, so I'll watch the buildbots and see what happens.)
........
r46621 | fredrik.lundh | 2006-06-03 23:56:05 +0200 (Sat, 03 Jun 2006) | 5 lines
"_self" is a said to be a reserved word in Watcom C 10.6. I'm
not sure that's really standard compliant behaviour, but I guess
we have to fix that anyway...
........
r46622 | andrew.kuchling | 2006-06-04 00:44:42 +0200 (Sun, 04 Jun 2006) | 1 line
Update readme
........
r46623 | andrew.kuchling | 2006-06-04 00:59:23 +0200 (Sun, 04 Jun 2006) | 1 line
Drop 0 parameter
........
r46624 | andrew.kuchling | 2006-06-04 00:59:59 +0200 (Sun, 04 Jun 2006) | 1 line
Some code tidying; use curses.wrapper
........
r46625 | andrew.kuchling | 2006-06-04 01:02:15 +0200 (Sun, 04 Jun 2006) | 1 line
Use True; value returned from main is unused
........
r46626 | andrew.kuchling | 2006-06-04 01:07:21 +0200 (Sun, 04 Jun 2006) | 1 line
Use true division, and the True value
........
r46627 | andrew.kuchling | 2006-06-04 01:09:58 +0200 (Sun, 04 Jun 2006) | 1 line
Docstring fix; use True
........
r46628 | andrew.kuchling | 2006-06-04 01:15:56 +0200 (Sun, 04 Jun 2006) | 1 line
Put code in a main() function; loosen up the spacing to match current code style
........
r46629 | andrew.kuchling | 2006-06-04 01:39:07 +0200 (Sun, 04 Jun 2006) | 1 line
Use functions; modernize code
........
r46630 | andrew.kuchling | 2006-06-04 01:43:22 +0200 (Sun, 04 Jun 2006) | 1 line
This demo requires Medusa (not just asyncore); remove it
........
r46631 | andrew.kuchling | 2006-06-04 01:46:36 +0200 (Sun, 04 Jun 2006) | 2 lines
Remove xmlrpc demo -- it duplicates the SimpleXMLRPCServer module.
........
r46632 | andrew.kuchling | 2006-06-04 01:47:22 +0200 (Sun, 04 Jun 2006) | 1 line
Remove xmlrpc/ directory
........
r46633 | andrew.kuchling | 2006-06-04 01:51:21 +0200 (Sun, 04 Jun 2006) | 1 line
Remove dangling reference
........
r46634 | andrew.kuchling | 2006-06-04 01:59:36 +0200 (Sun, 04 Jun 2006) | 1 line
Add more whitespace; use a better socket name
........
r46635 | tim.peters | 2006-06-04 03:22:53 +0200 (Sun, 04 Jun 2006) | 2 lines
Whitespace normalization.
........
r46637 | tim.peters | 2006-06-04 05:26:02 +0200 (Sun, 04 Jun 2006) | 16 lines
In a PYMALLOC_DEBUG build obmalloc adds extra debugging info
to each allocated block. This was using 4 bytes for each such
piece of info regardless of platform. This didn't really matter
before (proof: no bug reports, and the debug-build obmalloc would
have assert-failed if it was ever asked for a chunk of memory
>= 2**32 bytes), since container indices were plain ints. But after
the Py_ssize_t changes, it's at least theoretically possible to
allocate a list or string whose guts exceed 2**32 bytes, and the
PYMALLOC_DEBUG routines would fail then (having only 4 bytes
to record the originally requested size).
Now we use sizeof(size_t) bytes for each of a PYMALLOC_DEBUG
build's extra debugging fields. This won't make any difference
on 32-bit boxes, but will add 16 bytes to each allocation in
a debug build on a 64-bit box.
........
r46638 | tim.peters | 2006-06-04 05:38:04 +0200 (Sun, 04 Jun 2006) | 4 lines
_PyObject_DebugMalloc(): The return value should add
2*sizeof(size_t) now, not 8. This probably accounts for
current disasters on the 64-bit buildbot slaves.
........
r46639 | neal.norwitz | 2006-06-04 08:19:31 +0200 (Sun, 04 Jun 2006) | 1 line
SF #1499797, Fix for memory leak in WindowsError_str
........
r46640 | andrew.macintyre | 2006-06-04 14:31:09 +0200 (Sun, 04 Jun 2006) | 2 lines
Patch #1454481: Make thread stack size runtime tunable.
........
r46641 | andrew.macintyre | 2006-06-04 14:59:59 +0200 (Sun, 04 Jun 2006) | 2 lines
clean up function declarations to conform to PEP-7 style.
........
r46642 | martin.blais | 2006-06-04 15:49:49 +0200 (Sun, 04 Jun 2006) | 15 lines
Fixes in struct and socket from merge reviews.
- Following Guido's comments, renamed
* pack_to -> pack_into
* recv_buf -> recv_into
* recvfrom_buf -> recvfrom_into
- Made fixes to _struct.c according to Neal Norwitz comments on the checkins
list.
- Converted some ints into the appropriate -- I hope -- ssize_t and size_t.
........
r46643 | ronald.oussoren | 2006-06-04 16:05:28 +0200 (Sun, 04 Jun 2006) | 3 lines
"Import" LDFLAGS in Mac/OSX/Makefile.in to ensure pythonw gets build with
the right compiler flags.
........
r46644 | ronald.oussoren | 2006-06-04 16:24:59 +0200 (Sun, 04 Jun 2006) | 2 lines
Drop Mac wrappers for the WASTE library.
........
r46645 | tim.peters | 2006-06-04 17:49:07 +0200 (Sun, 04 Jun 2006) | 3 lines
s_methods[]: Stop compiler warnings by casting
s_unpack_from to PyCFunction.
........
r46646 | george.yoshida | 2006-06-04 19:04:12 +0200 (Sun, 04 Jun 2006) | 2 lines
Remove a redundant word
........
r46647 | george.yoshida | 2006-06-04 19:17:25 +0200 (Sun, 04 Jun 2006) | 2 lines
Markup fix
........
r46648 | martin.v.loewis | 2006-06-04 21:36:28 +0200 (Sun, 04 Jun 2006) | 2 lines
Patch #1359618: Speed-up charmap encoder.
........
r46649 | georg.brandl | 2006-06-04 23:46:16 +0200 (Sun, 04 Jun 2006) | 3 lines
Repair refleaks in unicodeobject.
........
r46650 | georg.brandl | 2006-06-04 23:56:52 +0200 (Sun, 04 Jun 2006) | 4 lines
Patch #1346214: correctly optimize away "if 0"-style stmts
(thanks to Neal for review)
........
r46651 | georg.brandl | 2006-06-05 00:15:37 +0200 (Mon, 05 Jun 2006) | 2 lines
Bug #1500293: fix memory leaks in _subprocess module.
........
r46654 | tim.peters | 2006-06-05 01:43:53 +0200 (Mon, 05 Jun 2006) | 2 lines
Whitespace normalization.
........
r46655 | tim.peters | 2006-06-05 01:52:47 +0200 (Mon, 05 Jun 2006) | 16 lines
Revert revisions:
46640 Patch #1454481: Make thread stack size runtime tunable.
46647 Markup fix
The first is causing many buildbots to fail test runs, and there
are multiple causes with seemingly no immediate prospects for
repairing them. See python-dev discussion.
Note that a branch can (and should) be created for resolving these
problems, like
svn copy svn+ssh://svn.python.org/python/trunk -r46640 svn+ssh://svn.python.org/python/branches/NEW_BRANCH
followed by merging rev 46647 to the new branch.
........
r46656 | andrew.kuchling | 2006-06-05 02:08:09 +0200 (Mon, 05 Jun 2006) | 1 line
Mention second encoding speedup
........
r46657 | gregory.p.smith | 2006-06-05 02:31:01 +0200 (Mon, 05 Jun 2006) | 7 lines
bugfix: when log_archive was called with the DB_ARCH_REMOVE flag present
in BerkeleyDB >= 4.2 it tried to construct a list out of an uninitialized
char **log_list.
feature: export the DB_ARCH_REMOVE flag by name in the module on BerkeleyDB >= 4.2.
........
r46658 | gregory.p.smith | 2006-06-05 02:33:35 +0200 (Mon, 05 Jun 2006) | 5 lines
fix a bug in the previous commit. don't leak empty list on error return and
fix the additional rare (out of memory only) bug that it was supposed to fix
of not freeing log_list when the python allocator failed.
........
r46660 | tim.peters | 2006-06-05 02:55:26 +0200 (Mon, 05 Jun 2006) | 9 lines
"Flat is better than nested."
Move the long-winded, multiply-nested -R support out
of runtest() and into some module-level helper functions.
This makes runtest() and the -R code easier to follow.
That in turn allowed seeing some opportunities for code
simplification, and made it obvious that reglog.txt
never got closed.
........
r46661 | hyeshik.chang | 2006-06-05 02:59:54 +0200 (Mon, 05 Jun 2006) | 3 lines
Fix a potentially invalid memory access of CJKCodecs' shift-jis
decoder. (found by Neal Norwitz)
........
r46663 | gregory.p.smith | 2006-06-05 03:39:52 +0200 (Mon, 05 Jun 2006) | 3 lines
* support DBEnv.log_stat() method on BerkeleyDB >= 4.0 [patch #1494885]
........
r46664 | tim.peters | 2006-06-05 03:43:03 +0200 (Mon, 05 Jun 2006) | 3 lines
Remove doctest.testmod's deprecated (in 2.4) `isprivate`
argument. A lot of hair went into supporting that!
........
r46665 | tim.peters | 2006-06-05 03:47:24 +0200 (Mon, 05 Jun 2006) | 2 lines
Whitespace normalization.
........
r46666 | tim.peters | 2006-06-05 03:48:21 +0200 (Mon, 05 Jun 2006) | 2 lines
Make doctest news more accurate.
........
r46667 | gregory.p.smith | 2006-06-05 03:56:15 +0200 (Mon, 05 Jun 2006) | 3 lines
* support DBEnv.lsn_reset() method on BerkeleyDB >= 4.4 [patch #1494902]
........
r46668 | gregory.p.smith | 2006-06-05 04:02:25 +0200 (Mon, 05 Jun 2006) | 3 lines
mention the just committed bsddb changes
........
r46671 | gregory.p.smith | 2006-06-05 19:38:04 +0200 (Mon, 05 Jun 2006) | 3 lines
* add support for DBSequence objects [patch #1466734]
........
r46672 | gregory.p.smith | 2006-06-05 20:20:07 +0200 (Mon, 05 Jun 2006) | 3 lines
forgot to add this file in previous commit
........
r46673 | tim.peters | 2006-06-05 20:36:12 +0200 (Mon, 05 Jun 2006) | 2 lines
Whitespace normalization.
........
r46674 | tim.peters | 2006-06-05 20:36:54 +0200 (Mon, 05 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46675 | gregory.p.smith | 2006-06-05 20:48:21 +0200 (Mon, 05 Jun 2006) | 4 lines
* fix DBCursor.pget() bug with keyword argument names when no data= is
supplied [SF pybsddb bug #1477863]
........
r46676 | andrew.kuchling | 2006-06-05 21:05:32 +0200 (Mon, 05 Jun 2006) | 1 line
Remove use of Trove name, which isn't very helpful to users
........
r46677 | andrew.kuchling | 2006-06-05 21:08:25 +0200 (Mon, 05 Jun 2006) | 1 line
[Bug #1470026] Include link to list of classifiers
........
r46679 | tim.peters | 2006-06-05 22:48:49 +0200 (Mon, 05 Jun 2006) | 10 lines
Access _struct attributes directly instead of mucking with getattr.
string_reverse(): Simplify.
assertRaises(): Raise TestFailed on failure.
test_unpack_from(), test_pack_into(), test_pack_into_fn(): never
use `assert` to test for an expected result (it doesn't test anything
when Python is run with -O).
........
r46680 | tim.peters | 2006-06-05 22:49:27 +0200 (Mon, 05 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46681 | gregory.p.smith | 2006-06-06 01:38:06 +0200 (Tue, 06 Jun 2006) | 3 lines
add depends = ['md5.h'] to the _md5 module extension for correctness sake.
........
r46682 | brett.cannon | 2006-06-06 01:51:55 +0200 (Tue, 06 Jun 2006) | 4 lines
Add 3 more bytes to a buffer to cover constants in string and null byte on top of 10 possible digits for an int.
Closes bug #1501223.
........
r46684 | gregory.p.smith | 2006-06-06 01:59:37 +0200 (Tue, 06 Jun 2006) | 5 lines
- bsddb: the __len__ method of a DB object has been fixed to return correct
results. It could previously incorrectly return 0 in some cases.
Fixes SF bug 1493322 (pybsddb bug 1184012).
........
r46686 | tim.peters | 2006-06-06 02:25:07 +0200 (Tue, 06 Jun 2006) | 7 lines
_PySys_Init(): It's rarely a good idea to size a buffer to the
exact maximum size someone guesses is needed. In this case, if
we're really worried about extreme integers, then "cp%d" can
actually need 14 bytes (2 for "cp" + 1 for \0 at the end +
11 for -(2**31-1)). So reserve 128 bytes instead -- nothing is
actually saved by making a stack-local buffer tiny.
........
r46687 | neal.norwitz | 2006-06-06 09:22:08 +0200 (Tue, 06 Jun 2006) | 1 line
Remove unused variable (and stop compiler warning)
........
r46688 | neal.norwitz | 2006-06-06 09:23:01 +0200 (Tue, 06 Jun 2006) | 1 line
Fix a bunch of parameter strings
........
r46689 | thomas.heller | 2006-06-06 13:34:33 +0200 (Tue, 06 Jun 2006) | 6 lines
Convert CFieldObject tp_members to tp_getset, since there is no
structmember typecode for Py_ssize_t fields. This should fix some of
the errors on the PPC64 debian machine (64-bit, big endian).
Assigning to readonly fields now raises AttributeError instead of
TypeError, so the testcase has to be changed as well.
........
r46690 | thomas.heller | 2006-06-06 13:54:32 +0200 (Tue, 06 Jun 2006) | 1 line
Damn - the sentinel was missing. And fix another silly mistake.
........
r46691 | martin.blais | 2006-06-06 14:46:55 +0200 (Tue, 06 Jun 2006) | 13 lines
Normalized a few cases of whitespace in function declarations.
Found them using::
find . -name '*.py' | while read i ; do grep 'def[^(]*( ' $i /dev/null ; done
find . -name '*.py' | while read i ; do grep ' ):' $i /dev/null ; done
(I was doing this all over my own code anyway, because I'd been using spaces in
all defs, so I thought I'd make a run on the Python code as well. If you need
to do such fixes in your own code, you can use xx-rename or parenregu.el within
emacs.)
........
r46693 | thomas.heller | 2006-06-06 17:34:18 +0200 (Tue, 06 Jun 2006) | 1 line
Specify argtypes for all test functions. Maybe that helps on strange ;-) architectures
........
r46694 | tim.peters | 2006-06-06 17:50:17 +0200 (Tue, 06 Jun 2006) | 5 lines
BSequence_set_range(): Rev 46688 ("Fix a bunch of
parameter strings") changed this function's signature
seemingly by mistake, which is causing buildbots to fail
test_bsddb3. Restored the pre-46688 signature.
........
r46695 | tim.peters | 2006-06-06 17:52:35 +0200 (Tue, 06 Jun 2006) | 4 lines
On python-dev Thomas Heller said these were committed
by mistake in rev 46693, so reverting this part of
rev 46693.
........
r46696 | andrew.kuchling | 2006-06-06 19:10:41 +0200 (Tue, 06 Jun 2006) | 1 line
Fix comment typo
........
r46697 | brett.cannon | 2006-06-06 20:08:16 +0200 (Tue, 06 Jun 2006) | 2 lines
Fix coding style guide bug.
........
r46698 | thomas.heller | 2006-06-06 20:50:46 +0200 (Tue, 06 Jun 2006) | 2 lines
Add a hack so that foreign functions returning float now do work on 64-bit
big endian platforms.
........
r46699 | thomas.heller | 2006-06-06 21:25:13 +0200 (Tue, 06 Jun 2006) | 3 lines
Use the same big-endian hack as in _ctypes/callproc.c for callback functions.
This fixes the callback function tests that return float.
........
r46700 | ronald.oussoren | 2006-06-06 21:50:24 +0200 (Tue, 06 Jun 2006) | 5 lines
* Ensure that "make altinstall" works when the tree was configured
with --enable-framework
* Also for --enable-framework: allow users to use --prefix to specify
the location of the compatibility symlinks (such as /usr/local/bin/python)
........
r46701 | ronald.oussoren | 2006-06-06 21:56:00 +0200 (Tue, 06 Jun 2006) | 3 lines
A quick hack to ensure the right key-bindings for IDLE on osx: install patched
configuration files during a framework install.
........
r46702 | tim.peters | 2006-06-07 03:04:59 +0200 (Wed, 07 Jun 2006) | 4 lines
dash_R_cleanup(): Clear filecmp._cache. This accounts for
different results across -R runs (at least on Windows) of
test_filecmp.
........
r46705 | tim.peters | 2006-06-07 08:57:51 +0200 (Wed, 07 Jun 2006) | 17 lines
SF patch 1501987: Remove randomness from test_exceptions,
from ?iga Seilnacht (sorry about the name, but Firefox
on my box can't display the first character of the name --
the SF "Unix name" is zseil).
This appears to cure the oddball intermittent leaks across
runs when running test_exceptions under -R. I'm not sure
why, but I'm too sleepy to care ;-)
The thrust of the SF patch was to remove randomness in the
pickle protocol used. I changed the patch to use
range(pickle.HIGHEST_PROTOCOL + 1), to try both pickle and
cPickle, and randomly mucked with other test lines to put
statements on their own lines.
Not a bugfix candidate (this is fiddling new-in-2.5 code).
........
r46706 | andrew.kuchling | 2006-06-07 15:55:33 +0200 (Wed, 07 Jun 2006) | 1 line
Add an SQLite introduction, taken from the 'What's New' text
........
r46708 | andrew.kuchling | 2006-06-07 19:02:52 +0200 (Wed, 07 Jun 2006) | 1 line
Mention other placeholders
........
r46709 | andrew.kuchling | 2006-06-07 19:03:46 +0200 (Wed, 07 Jun 2006) | 1 line
Add an item; also, escape %
........
r46710 | andrew.kuchling | 2006-06-07 19:04:01 +0200 (Wed, 07 Jun 2006) | 1 line
Mention other placeholders
........
r46716 | ronald.oussoren | 2006-06-07 20:57:44 +0200 (Wed, 07 Jun 2006) | 2 lines
Move Mac/OSX/Tools one level up
........
r46717 | ronald.oussoren | 2006-06-07 20:58:01 +0200 (Wed, 07 Jun 2006) | 2 lines
Move Mac/OSX/PythonLauncher one level up
........
r46718 | ronald.oussoren | 2006-06-07 20:58:42 +0200 (Wed, 07 Jun 2006) | 2 lines
mv Mac/OSX/BuildScript one level up
........
r46719 | ronald.oussoren | 2006-06-07 21:02:03 +0200 (Wed, 07 Jun 2006) | 2 lines
Move Mac/OSX/* one level up
........
r46720 | ronald.oussoren | 2006-06-07 21:06:01 +0200 (Wed, 07 Jun 2006) | 2 lines
And the last bit: move IDLE one level up and adjust makefiles
........
r46723 | ronald.oussoren | 2006-06-07 21:38:53 +0200 (Wed, 07 Jun 2006) | 4 lines
- Patch the correct version of python in the Info.plists at build time, instead
of relying on a maintainer to update them before releases.
- Remove the now empty Mac/OSX directory
........
r46727 | ronald.oussoren | 2006-06-07 22:18:44 +0200 (Wed, 07 Jun 2006) | 7 lines
* If BuildApplet.py is used as an applet it starts with a version of
sys.exutable that isn't usuable on an #!-line. That results in generated
applets that don't actually work. Work around this problem by resetting
sys.executable.
* argvemulator.py didn't work on intel macs. This patch fixes this
(bug #1491468)
........
r46728 | tim.peters | 2006-06-07 22:40:06 +0200 (Wed, 07 Jun 2006) | 2 lines
Whitespace normalization.
........
r46729 | tim.peters | 2006-06-07 22:40:54 +0200 (Wed, 07 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46730 | thomas.heller | 2006-06-07 22:43:06 +0200 (Wed, 07 Jun 2006) | 7 lines
Fix for foreign functions returning small structures on 64-bit big
endian machines. Should fix the remaininf failure in the PPC64
Debian buildbot.
Thanks to Matthias Klose for providing access to a machine to debug
and test this.
........
r46731 | brett.cannon | 2006-06-07 23:48:17 +0200 (Wed, 07 Jun 2006) | 2 lines
Clarify documentation for bf_getcharbuffer.
........
r46735 | neal.norwitz | 2006-06-08 07:12:45 +0200 (Thu, 08 Jun 2006) | 1 line
Fix a refleak in recvfrom_into
........
r46736 | gregory.p.smith | 2006-06-08 07:17:08 +0200 (Thu, 08 Jun 2006) | 9 lines
- bsddb: the bsddb.dbtables Modify method now raises the proper error and
aborts the db transaction safely when a modifier callback fails.
Fixes SF python patch/bug #1408584.
Also cleans up the bsddb.dbtables docstrings since thats the only
documentation that exists for that unadvertised module. (people
really should really just use sqlite3)
........
r46737 | gregory.p.smith | 2006-06-08 07:38:11 +0200 (Thu, 08 Jun 2006) | 4 lines
* Turn the deadlock situation described in SF bug #775414 into a
DBDeadLockError exception.
* add the test case for my previous dbtables commit.
........
r46738 | gregory.p.smith | 2006-06-08 07:39:54 +0200 (Thu, 08 Jun 2006) | 2 lines
pasted set_lk_detect line in wrong spot in previous commit. fixed. passes tests this time.
........
r46739 | armin.rigo | 2006-06-08 12:56:24 +0200 (Thu, 08 Jun 2006) | 6 lines
(arre, arigo) SF bug #1350060
Give a consistent behavior for comparison and hashing of method objects
(both user- and built-in methods). Now compares the 'self' recursively.
The hash was already asking for the hash of 'self'.
........
r46740 | andrew.kuchling | 2006-06-08 13:56:44 +0200 (Thu, 08 Jun 2006) | 1 line
Typo fix
........
r46741 | georg.brandl | 2006-06-08 14:45:01 +0200 (Thu, 08 Jun 2006) | 2 lines
Bug #1502750: Fix getargs "i" format to use LONG_MIN and LONG_MAX for bounds checking.
........
r46743 | georg.brandl | 2006-06-08 14:54:13 +0200 (Thu, 08 Jun 2006) | 2 lines
Bug #1502728: Correctly link against librt library on HP-UX.
........
r46745 | georg.brandl | 2006-06-08 14:55:47 +0200 (Thu, 08 Jun 2006) | 3 lines
Add news for recent bugfix.
........
r46746 | georg.brandl | 2006-06-08 15:31:07 +0200 (Thu, 08 Jun 2006) | 4 lines
Argh. "integer" is a very confusing word ;)
Actually, checking for INT_MAX and INT_MIN is correct since
the format code explicitly handles a C "int".
........
r46748 | nick.coghlan | 2006-06-08 15:54:49 +0200 (Thu, 08 Jun 2006) | 1 line
Add functools.update_wrapper() and functools.wraps() as described in PEP 356
........
r46751 | georg.brandl | 2006-06-08 16:50:21 +0200 (Thu, 08 Jun 2006) | 4 lines
Bug #1502805: don't alias file.__exit__ to file.close since the
latter can return something that's true.
........
r46752 | georg.brandl | 2006-06-08 16:50:53 +0200 (Thu, 08 Jun 2006) | 3 lines
Convert test_file to unittest.
........
2006-06-08 12:35:45 -03:00
|
|
|
def __del__(self):
|
2003-06-21 11:41:32 -03:00
|
|
|
if self.w:
|
|
|
|
self.w.BringToFront()
|
|
|
|
self.w.HideWindow()
|
|
|
|
del self.w
|
|
|
|
del self.d
|
|
|
|
|
|
|
|
def title(self, newstr=""):
|
|
|
|
"""title(text) - Set title of progress window"""
|
|
|
|
self.w.BringToFront()
|
|
|
|
self.w.SetWTitle(newstr)
|
|
|
|
|
Merge the rest of the trunk.
Merged revisions 46490-46494,46496,46498,46500,46506,46521,46538,46558,46563-46567,46570-46571,46583,46593,46595-46598,46604,46606,46609-46753 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46610 | martin.v.loewis | 2006-06-03 09:42:26 +0200 (Sat, 03 Jun 2006) | 2 lines
Updated version (win32-icons2.zip) from #1490384.
........
r46612 | andrew.kuchling | 2006-06-03 20:09:41 +0200 (Sat, 03 Jun 2006) | 1 line
[Bug #1472084] Fix description of do_tag
........
r46614 | andrew.kuchling | 2006-06-03 20:33:35 +0200 (Sat, 03 Jun 2006) | 1 line
[Bug #1475554] Strengthen text to say 'must' instead of 'should'
........
r46616 | andrew.kuchling | 2006-06-03 20:41:28 +0200 (Sat, 03 Jun 2006) | 1 line
[Bug #1441864] Clarify description of 'data' argument
........
r46617 | andrew.kuchling | 2006-06-03 20:43:24 +0200 (Sat, 03 Jun 2006) | 1 line
Minor rewording
........
r46619 | andrew.kuchling | 2006-06-03 21:02:35 +0200 (Sat, 03 Jun 2006) | 9 lines
[Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler.
Fix by renaming the variable.
In a different module, Neal fixed it by renaming _self to self. There's
already a variable named 'self' here, so I used selfptr.
(I'm committing this on a Mac without Tk, but it's a simple search-and-replace.
<crosses fingers>, so I'll watch the buildbots and see what happens.)
........
r46621 | fredrik.lundh | 2006-06-03 23:56:05 +0200 (Sat, 03 Jun 2006) | 5 lines
"_self" is a said to be a reserved word in Watcom C 10.6. I'm
not sure that's really standard compliant behaviour, but I guess
we have to fix that anyway...
........
r46622 | andrew.kuchling | 2006-06-04 00:44:42 +0200 (Sun, 04 Jun 2006) | 1 line
Update readme
........
r46623 | andrew.kuchling | 2006-06-04 00:59:23 +0200 (Sun, 04 Jun 2006) | 1 line
Drop 0 parameter
........
r46624 | andrew.kuchling | 2006-06-04 00:59:59 +0200 (Sun, 04 Jun 2006) | 1 line
Some code tidying; use curses.wrapper
........
r46625 | andrew.kuchling | 2006-06-04 01:02:15 +0200 (Sun, 04 Jun 2006) | 1 line
Use True; value returned from main is unused
........
r46626 | andrew.kuchling | 2006-06-04 01:07:21 +0200 (Sun, 04 Jun 2006) | 1 line
Use true division, and the True value
........
r46627 | andrew.kuchling | 2006-06-04 01:09:58 +0200 (Sun, 04 Jun 2006) | 1 line
Docstring fix; use True
........
r46628 | andrew.kuchling | 2006-06-04 01:15:56 +0200 (Sun, 04 Jun 2006) | 1 line
Put code in a main() function; loosen up the spacing to match current code style
........
r46629 | andrew.kuchling | 2006-06-04 01:39:07 +0200 (Sun, 04 Jun 2006) | 1 line
Use functions; modernize code
........
r46630 | andrew.kuchling | 2006-06-04 01:43:22 +0200 (Sun, 04 Jun 2006) | 1 line
This demo requires Medusa (not just asyncore); remove it
........
r46631 | andrew.kuchling | 2006-06-04 01:46:36 +0200 (Sun, 04 Jun 2006) | 2 lines
Remove xmlrpc demo -- it duplicates the SimpleXMLRPCServer module.
........
r46632 | andrew.kuchling | 2006-06-04 01:47:22 +0200 (Sun, 04 Jun 2006) | 1 line
Remove xmlrpc/ directory
........
r46633 | andrew.kuchling | 2006-06-04 01:51:21 +0200 (Sun, 04 Jun 2006) | 1 line
Remove dangling reference
........
r46634 | andrew.kuchling | 2006-06-04 01:59:36 +0200 (Sun, 04 Jun 2006) | 1 line
Add more whitespace; use a better socket name
........
r46635 | tim.peters | 2006-06-04 03:22:53 +0200 (Sun, 04 Jun 2006) | 2 lines
Whitespace normalization.
........
r46637 | tim.peters | 2006-06-04 05:26:02 +0200 (Sun, 04 Jun 2006) | 16 lines
In a PYMALLOC_DEBUG build obmalloc adds extra debugging info
to each allocated block. This was using 4 bytes for each such
piece of info regardless of platform. This didn't really matter
before (proof: no bug reports, and the debug-build obmalloc would
have assert-failed if it was ever asked for a chunk of memory
>= 2**32 bytes), since container indices were plain ints. But after
the Py_ssize_t changes, it's at least theoretically possible to
allocate a list or string whose guts exceed 2**32 bytes, and the
PYMALLOC_DEBUG routines would fail then (having only 4 bytes
to record the originally requested size).
Now we use sizeof(size_t) bytes for each of a PYMALLOC_DEBUG
build's extra debugging fields. This won't make any difference
on 32-bit boxes, but will add 16 bytes to each allocation in
a debug build on a 64-bit box.
........
r46638 | tim.peters | 2006-06-04 05:38:04 +0200 (Sun, 04 Jun 2006) | 4 lines
_PyObject_DebugMalloc(): The return value should add
2*sizeof(size_t) now, not 8. This probably accounts for
current disasters on the 64-bit buildbot slaves.
........
r46639 | neal.norwitz | 2006-06-04 08:19:31 +0200 (Sun, 04 Jun 2006) | 1 line
SF #1499797, Fix for memory leak in WindowsError_str
........
r46640 | andrew.macintyre | 2006-06-04 14:31:09 +0200 (Sun, 04 Jun 2006) | 2 lines
Patch #1454481: Make thread stack size runtime tunable.
........
r46641 | andrew.macintyre | 2006-06-04 14:59:59 +0200 (Sun, 04 Jun 2006) | 2 lines
clean up function declarations to conform to PEP-7 style.
........
r46642 | martin.blais | 2006-06-04 15:49:49 +0200 (Sun, 04 Jun 2006) | 15 lines
Fixes in struct and socket from merge reviews.
- Following Guido's comments, renamed
* pack_to -> pack_into
* recv_buf -> recv_into
* recvfrom_buf -> recvfrom_into
- Made fixes to _struct.c according to Neal Norwitz comments on the checkins
list.
- Converted some ints into the appropriate -- I hope -- ssize_t and size_t.
........
r46643 | ronald.oussoren | 2006-06-04 16:05:28 +0200 (Sun, 04 Jun 2006) | 3 lines
"Import" LDFLAGS in Mac/OSX/Makefile.in to ensure pythonw gets build with
the right compiler flags.
........
r46644 | ronald.oussoren | 2006-06-04 16:24:59 +0200 (Sun, 04 Jun 2006) | 2 lines
Drop Mac wrappers for the WASTE library.
........
r46645 | tim.peters | 2006-06-04 17:49:07 +0200 (Sun, 04 Jun 2006) | 3 lines
s_methods[]: Stop compiler warnings by casting
s_unpack_from to PyCFunction.
........
r46646 | george.yoshida | 2006-06-04 19:04:12 +0200 (Sun, 04 Jun 2006) | 2 lines
Remove a redundant word
........
r46647 | george.yoshida | 2006-06-04 19:17:25 +0200 (Sun, 04 Jun 2006) | 2 lines
Markup fix
........
r46648 | martin.v.loewis | 2006-06-04 21:36:28 +0200 (Sun, 04 Jun 2006) | 2 lines
Patch #1359618: Speed-up charmap encoder.
........
r46649 | georg.brandl | 2006-06-04 23:46:16 +0200 (Sun, 04 Jun 2006) | 3 lines
Repair refleaks in unicodeobject.
........
r46650 | georg.brandl | 2006-06-04 23:56:52 +0200 (Sun, 04 Jun 2006) | 4 lines
Patch #1346214: correctly optimize away "if 0"-style stmts
(thanks to Neal for review)
........
r46651 | georg.brandl | 2006-06-05 00:15:37 +0200 (Mon, 05 Jun 2006) | 2 lines
Bug #1500293: fix memory leaks in _subprocess module.
........
r46654 | tim.peters | 2006-06-05 01:43:53 +0200 (Mon, 05 Jun 2006) | 2 lines
Whitespace normalization.
........
r46655 | tim.peters | 2006-06-05 01:52:47 +0200 (Mon, 05 Jun 2006) | 16 lines
Revert revisions:
46640 Patch #1454481: Make thread stack size runtime tunable.
46647 Markup fix
The first is causing many buildbots to fail test runs, and there
are multiple causes with seemingly no immediate prospects for
repairing them. See python-dev discussion.
Note that a branch can (and should) be created for resolving these
problems, like
svn copy svn+ssh://svn.python.org/python/trunk -r46640 svn+ssh://svn.python.org/python/branches/NEW_BRANCH
followed by merging rev 46647 to the new branch.
........
r46656 | andrew.kuchling | 2006-06-05 02:08:09 +0200 (Mon, 05 Jun 2006) | 1 line
Mention second encoding speedup
........
r46657 | gregory.p.smith | 2006-06-05 02:31:01 +0200 (Mon, 05 Jun 2006) | 7 lines
bugfix: when log_archive was called with the DB_ARCH_REMOVE flag present
in BerkeleyDB >= 4.2 it tried to construct a list out of an uninitialized
char **log_list.
feature: export the DB_ARCH_REMOVE flag by name in the module on BerkeleyDB >= 4.2.
........
r46658 | gregory.p.smith | 2006-06-05 02:33:35 +0200 (Mon, 05 Jun 2006) | 5 lines
fix a bug in the previous commit. don't leak empty list on error return and
fix the additional rare (out of memory only) bug that it was supposed to fix
of not freeing log_list when the python allocator failed.
........
r46660 | tim.peters | 2006-06-05 02:55:26 +0200 (Mon, 05 Jun 2006) | 9 lines
"Flat is better than nested."
Move the long-winded, multiply-nested -R support out
of runtest() and into some module-level helper functions.
This makes runtest() and the -R code easier to follow.
That in turn allowed seeing some opportunities for code
simplification, and made it obvious that reglog.txt
never got closed.
........
r46661 | hyeshik.chang | 2006-06-05 02:59:54 +0200 (Mon, 05 Jun 2006) | 3 lines
Fix a potentially invalid memory access of CJKCodecs' shift-jis
decoder. (found by Neal Norwitz)
........
r46663 | gregory.p.smith | 2006-06-05 03:39:52 +0200 (Mon, 05 Jun 2006) | 3 lines
* support DBEnv.log_stat() method on BerkeleyDB >= 4.0 [patch #1494885]
........
r46664 | tim.peters | 2006-06-05 03:43:03 +0200 (Mon, 05 Jun 2006) | 3 lines
Remove doctest.testmod's deprecated (in 2.4) `isprivate`
argument. A lot of hair went into supporting that!
........
r46665 | tim.peters | 2006-06-05 03:47:24 +0200 (Mon, 05 Jun 2006) | 2 lines
Whitespace normalization.
........
r46666 | tim.peters | 2006-06-05 03:48:21 +0200 (Mon, 05 Jun 2006) | 2 lines
Make doctest news more accurate.
........
r46667 | gregory.p.smith | 2006-06-05 03:56:15 +0200 (Mon, 05 Jun 2006) | 3 lines
* support DBEnv.lsn_reset() method on BerkeleyDB >= 4.4 [patch #1494902]
........
r46668 | gregory.p.smith | 2006-06-05 04:02:25 +0200 (Mon, 05 Jun 2006) | 3 lines
mention the just committed bsddb changes
........
r46671 | gregory.p.smith | 2006-06-05 19:38:04 +0200 (Mon, 05 Jun 2006) | 3 lines
* add support for DBSequence objects [patch #1466734]
........
r46672 | gregory.p.smith | 2006-06-05 20:20:07 +0200 (Mon, 05 Jun 2006) | 3 lines
forgot to add this file in previous commit
........
r46673 | tim.peters | 2006-06-05 20:36:12 +0200 (Mon, 05 Jun 2006) | 2 lines
Whitespace normalization.
........
r46674 | tim.peters | 2006-06-05 20:36:54 +0200 (Mon, 05 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46675 | gregory.p.smith | 2006-06-05 20:48:21 +0200 (Mon, 05 Jun 2006) | 4 lines
* fix DBCursor.pget() bug with keyword argument names when no data= is
supplied [SF pybsddb bug #1477863]
........
r46676 | andrew.kuchling | 2006-06-05 21:05:32 +0200 (Mon, 05 Jun 2006) | 1 line
Remove use of Trove name, which isn't very helpful to users
........
r46677 | andrew.kuchling | 2006-06-05 21:08:25 +0200 (Mon, 05 Jun 2006) | 1 line
[Bug #1470026] Include link to list of classifiers
........
r46679 | tim.peters | 2006-06-05 22:48:49 +0200 (Mon, 05 Jun 2006) | 10 lines
Access _struct attributes directly instead of mucking with getattr.
string_reverse(): Simplify.
assertRaises(): Raise TestFailed on failure.
test_unpack_from(), test_pack_into(), test_pack_into_fn(): never
use `assert` to test for an expected result (it doesn't test anything
when Python is run with -O).
........
r46680 | tim.peters | 2006-06-05 22:49:27 +0200 (Mon, 05 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46681 | gregory.p.smith | 2006-06-06 01:38:06 +0200 (Tue, 06 Jun 2006) | 3 lines
add depends = ['md5.h'] to the _md5 module extension for correctness sake.
........
r46682 | brett.cannon | 2006-06-06 01:51:55 +0200 (Tue, 06 Jun 2006) | 4 lines
Add 3 more bytes to a buffer to cover constants in string and null byte on top of 10 possible digits for an int.
Closes bug #1501223.
........
r46684 | gregory.p.smith | 2006-06-06 01:59:37 +0200 (Tue, 06 Jun 2006) | 5 lines
- bsddb: the __len__ method of a DB object has been fixed to return correct
results. It could previously incorrectly return 0 in some cases.
Fixes SF bug 1493322 (pybsddb bug 1184012).
........
r46686 | tim.peters | 2006-06-06 02:25:07 +0200 (Tue, 06 Jun 2006) | 7 lines
_PySys_Init(): It's rarely a good idea to size a buffer to the
exact maximum size someone guesses is needed. In this case, if
we're really worried about extreme integers, then "cp%d" can
actually need 14 bytes (2 for "cp" + 1 for \0 at the end +
11 for -(2**31-1)). So reserve 128 bytes instead -- nothing is
actually saved by making a stack-local buffer tiny.
........
r46687 | neal.norwitz | 2006-06-06 09:22:08 +0200 (Tue, 06 Jun 2006) | 1 line
Remove unused variable (and stop compiler warning)
........
r46688 | neal.norwitz | 2006-06-06 09:23:01 +0200 (Tue, 06 Jun 2006) | 1 line
Fix a bunch of parameter strings
........
r46689 | thomas.heller | 2006-06-06 13:34:33 +0200 (Tue, 06 Jun 2006) | 6 lines
Convert CFieldObject tp_members to tp_getset, since there is no
structmember typecode for Py_ssize_t fields. This should fix some of
the errors on the PPC64 debian machine (64-bit, big endian).
Assigning to readonly fields now raises AttributeError instead of
TypeError, so the testcase has to be changed as well.
........
r46690 | thomas.heller | 2006-06-06 13:54:32 +0200 (Tue, 06 Jun 2006) | 1 line
Damn - the sentinel was missing. And fix another silly mistake.
........
r46691 | martin.blais | 2006-06-06 14:46:55 +0200 (Tue, 06 Jun 2006) | 13 lines
Normalized a few cases of whitespace in function declarations.
Found them using::
find . -name '*.py' | while read i ; do grep 'def[^(]*( ' $i /dev/null ; done
find . -name '*.py' | while read i ; do grep ' ):' $i /dev/null ; done
(I was doing this all over my own code anyway, because I'd been using spaces in
all defs, so I thought I'd make a run on the Python code as well. If you need
to do such fixes in your own code, you can use xx-rename or parenregu.el within
emacs.)
........
r46693 | thomas.heller | 2006-06-06 17:34:18 +0200 (Tue, 06 Jun 2006) | 1 line
Specify argtypes for all test functions. Maybe that helps on strange ;-) architectures
........
r46694 | tim.peters | 2006-06-06 17:50:17 +0200 (Tue, 06 Jun 2006) | 5 lines
BSequence_set_range(): Rev 46688 ("Fix a bunch of
parameter strings") changed this function's signature
seemingly by mistake, which is causing buildbots to fail
test_bsddb3. Restored the pre-46688 signature.
........
r46695 | tim.peters | 2006-06-06 17:52:35 +0200 (Tue, 06 Jun 2006) | 4 lines
On python-dev Thomas Heller said these were committed
by mistake in rev 46693, so reverting this part of
rev 46693.
........
r46696 | andrew.kuchling | 2006-06-06 19:10:41 +0200 (Tue, 06 Jun 2006) | 1 line
Fix comment typo
........
r46697 | brett.cannon | 2006-06-06 20:08:16 +0200 (Tue, 06 Jun 2006) | 2 lines
Fix coding style guide bug.
........
r46698 | thomas.heller | 2006-06-06 20:50:46 +0200 (Tue, 06 Jun 2006) | 2 lines
Add a hack so that foreign functions returning float now do work on 64-bit
big endian platforms.
........
r46699 | thomas.heller | 2006-06-06 21:25:13 +0200 (Tue, 06 Jun 2006) | 3 lines
Use the same big-endian hack as in _ctypes/callproc.c for callback functions.
This fixes the callback function tests that return float.
........
r46700 | ronald.oussoren | 2006-06-06 21:50:24 +0200 (Tue, 06 Jun 2006) | 5 lines
* Ensure that "make altinstall" works when the tree was configured
with --enable-framework
* Also for --enable-framework: allow users to use --prefix to specify
the location of the compatibility symlinks (such as /usr/local/bin/python)
........
r46701 | ronald.oussoren | 2006-06-06 21:56:00 +0200 (Tue, 06 Jun 2006) | 3 lines
A quick hack to ensure the right key-bindings for IDLE on osx: install patched
configuration files during a framework install.
........
r46702 | tim.peters | 2006-06-07 03:04:59 +0200 (Wed, 07 Jun 2006) | 4 lines
dash_R_cleanup(): Clear filecmp._cache. This accounts for
different results across -R runs (at least on Windows) of
test_filecmp.
........
r46705 | tim.peters | 2006-06-07 08:57:51 +0200 (Wed, 07 Jun 2006) | 17 lines
SF patch 1501987: Remove randomness from test_exceptions,
from ?iga Seilnacht (sorry about the name, but Firefox
on my box can't display the first character of the name --
the SF "Unix name" is zseil).
This appears to cure the oddball intermittent leaks across
runs when running test_exceptions under -R. I'm not sure
why, but I'm too sleepy to care ;-)
The thrust of the SF patch was to remove randomness in the
pickle protocol used. I changed the patch to use
range(pickle.HIGHEST_PROTOCOL + 1), to try both pickle and
cPickle, and randomly mucked with other test lines to put
statements on their own lines.
Not a bugfix candidate (this is fiddling new-in-2.5 code).
........
r46706 | andrew.kuchling | 2006-06-07 15:55:33 +0200 (Wed, 07 Jun 2006) | 1 line
Add an SQLite introduction, taken from the 'What's New' text
........
r46708 | andrew.kuchling | 2006-06-07 19:02:52 +0200 (Wed, 07 Jun 2006) | 1 line
Mention other placeholders
........
r46709 | andrew.kuchling | 2006-06-07 19:03:46 +0200 (Wed, 07 Jun 2006) | 1 line
Add an item; also, escape %
........
r46710 | andrew.kuchling | 2006-06-07 19:04:01 +0200 (Wed, 07 Jun 2006) | 1 line
Mention other placeholders
........
r46716 | ronald.oussoren | 2006-06-07 20:57:44 +0200 (Wed, 07 Jun 2006) | 2 lines
Move Mac/OSX/Tools one level up
........
r46717 | ronald.oussoren | 2006-06-07 20:58:01 +0200 (Wed, 07 Jun 2006) | 2 lines
Move Mac/OSX/PythonLauncher one level up
........
r46718 | ronald.oussoren | 2006-06-07 20:58:42 +0200 (Wed, 07 Jun 2006) | 2 lines
mv Mac/OSX/BuildScript one level up
........
r46719 | ronald.oussoren | 2006-06-07 21:02:03 +0200 (Wed, 07 Jun 2006) | 2 lines
Move Mac/OSX/* one level up
........
r46720 | ronald.oussoren | 2006-06-07 21:06:01 +0200 (Wed, 07 Jun 2006) | 2 lines
And the last bit: move IDLE one level up and adjust makefiles
........
r46723 | ronald.oussoren | 2006-06-07 21:38:53 +0200 (Wed, 07 Jun 2006) | 4 lines
- Patch the correct version of python in the Info.plists at build time, instead
of relying on a maintainer to update them before releases.
- Remove the now empty Mac/OSX directory
........
r46727 | ronald.oussoren | 2006-06-07 22:18:44 +0200 (Wed, 07 Jun 2006) | 7 lines
* If BuildApplet.py is used as an applet it starts with a version of
sys.exutable that isn't usuable on an #!-line. That results in generated
applets that don't actually work. Work around this problem by resetting
sys.executable.
* argvemulator.py didn't work on intel macs. This patch fixes this
(bug #1491468)
........
r46728 | tim.peters | 2006-06-07 22:40:06 +0200 (Wed, 07 Jun 2006) | 2 lines
Whitespace normalization.
........
r46729 | tim.peters | 2006-06-07 22:40:54 +0200 (Wed, 07 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46730 | thomas.heller | 2006-06-07 22:43:06 +0200 (Wed, 07 Jun 2006) | 7 lines
Fix for foreign functions returning small structures on 64-bit big
endian machines. Should fix the remaininf failure in the PPC64
Debian buildbot.
Thanks to Matthias Klose for providing access to a machine to debug
and test this.
........
r46731 | brett.cannon | 2006-06-07 23:48:17 +0200 (Wed, 07 Jun 2006) | 2 lines
Clarify documentation for bf_getcharbuffer.
........
r46735 | neal.norwitz | 2006-06-08 07:12:45 +0200 (Thu, 08 Jun 2006) | 1 line
Fix a refleak in recvfrom_into
........
r46736 | gregory.p.smith | 2006-06-08 07:17:08 +0200 (Thu, 08 Jun 2006) | 9 lines
- bsddb: the bsddb.dbtables Modify method now raises the proper error and
aborts the db transaction safely when a modifier callback fails.
Fixes SF python patch/bug #1408584.
Also cleans up the bsddb.dbtables docstrings since thats the only
documentation that exists for that unadvertised module. (people
really should really just use sqlite3)
........
r46737 | gregory.p.smith | 2006-06-08 07:38:11 +0200 (Thu, 08 Jun 2006) | 4 lines
* Turn the deadlock situation described in SF bug #775414 into a
DBDeadLockError exception.
* add the test case for my previous dbtables commit.
........
r46738 | gregory.p.smith | 2006-06-08 07:39:54 +0200 (Thu, 08 Jun 2006) | 2 lines
pasted set_lk_detect line in wrong spot in previous commit. fixed. passes tests this time.
........
r46739 | armin.rigo | 2006-06-08 12:56:24 +0200 (Thu, 08 Jun 2006) | 6 lines
(arre, arigo) SF bug #1350060
Give a consistent behavior for comparison and hashing of method objects
(both user- and built-in methods). Now compares the 'self' recursively.
The hash was already asking for the hash of 'self'.
........
r46740 | andrew.kuchling | 2006-06-08 13:56:44 +0200 (Thu, 08 Jun 2006) | 1 line
Typo fix
........
r46741 | georg.brandl | 2006-06-08 14:45:01 +0200 (Thu, 08 Jun 2006) | 2 lines
Bug #1502750: Fix getargs "i" format to use LONG_MIN and LONG_MAX for bounds checking.
........
r46743 | georg.brandl | 2006-06-08 14:54:13 +0200 (Thu, 08 Jun 2006) | 2 lines
Bug #1502728: Correctly link against librt library on HP-UX.
........
r46745 | georg.brandl | 2006-06-08 14:55:47 +0200 (Thu, 08 Jun 2006) | 3 lines
Add news for recent bugfix.
........
r46746 | georg.brandl | 2006-06-08 15:31:07 +0200 (Thu, 08 Jun 2006) | 4 lines
Argh. "integer" is a very confusing word ;)
Actually, checking for INT_MAX and INT_MIN is correct since
the format code explicitly handles a C "int".
........
r46748 | nick.coghlan | 2006-06-08 15:54:49 +0200 (Thu, 08 Jun 2006) | 1 line
Add functools.update_wrapper() and functools.wraps() as described in PEP 356
........
r46751 | georg.brandl | 2006-06-08 16:50:21 +0200 (Thu, 08 Jun 2006) | 4 lines
Bug #1502805: don't alias file.__exit__ to file.close since the
latter can return something that's true.
........
r46752 | georg.brandl | 2006-06-08 16:50:53 +0200 (Thu, 08 Jun 2006) | 3 lines
Convert test_file to unittest.
........
2006-06-08 12:35:45 -03:00
|
|
|
def label(self, *newstr):
|
2003-06-21 11:41:32 -03:00
|
|
|
"""label(text) - Set text in progress box"""
|
|
|
|
self.w.BringToFront()
|
|
|
|
if newstr:
|
|
|
|
self._label = lf2cr(newstr[0])
|
|
|
|
text_h = self.d.GetDialogItemAsControl(2)
|
|
|
|
SetDialogItemText(text_h, self._label)
|
|
|
|
|
|
|
|
def _update(self, value):
|
|
|
|
maxval = self.maxval
|
|
|
|
if maxval == 0: # an indeterminate bar
|
|
|
|
Ctl.IdleControls(self.w) # spin the barber pole
|
|
|
|
else: # a determinate bar
|
|
|
|
if maxval > 32767:
|
|
|
|
value = int(value/(maxval/32767.0))
|
|
|
|
maxval = 32767
|
|
|
|
maxval = int(maxval)
|
|
|
|
value = int(value)
|
|
|
|
progbar = self.d.GetDialogItemAsControl(3)
|
|
|
|
progbar.SetControlMaximum(maxval)
|
|
|
|
progbar.SetControlValue(value) # set the bar length
|
|
|
|
|
|
|
|
# Test for cancel button
|
|
|
|
ready, ev = Evt.WaitNextEvent( Events.mDownMask, 1 )
|
|
|
|
if ready :
|
|
|
|
what,msg,when,where,mod = ev
|
|
|
|
part = Win.FindWindow(where)[0]
|
|
|
|
if Dlg.IsDialogEvent(ev):
|
|
|
|
ds = Dlg.DialogSelect(ev)
|
|
|
|
if ds[0] and ds[1] == self.d and ds[-1] == 1:
|
|
|
|
self.w.HideWindow()
|
|
|
|
self.w = None
|
|
|
|
self.d = None
|
2007-08-22 21:01:55 -03:00
|
|
|
raise KeyboardInterrupt(ev)
|
2003-06-21 11:41:32 -03:00
|
|
|
else:
|
|
|
|
if part == 4: # inDrag
|
|
|
|
self.w.DragWindow(where, screenbounds)
|
|
|
|
else:
|
|
|
|
MacOS.HandleEvent(ev)
|
|
|
|
|
|
|
|
|
|
|
|
def set(self, value, max=None):
|
|
|
|
"""set(value) - Set progress bar position"""
|
|
|
|
if max != None:
|
|
|
|
self.maxval = max
|
|
|
|
bar = self.d.GetDialogItemAsControl(3)
|
|
|
|
if max <= 0: # indeterminate bar
|
|
|
|
bar.SetControlData(0,kControlProgressBarIndeterminateTag,'\x01')
|
|
|
|
else: # determinate bar
|
|
|
|
bar.SetControlData(0,kControlProgressBarIndeterminateTag,'\x00')
|
|
|
|
if value < 0:
|
|
|
|
value = 0
|
|
|
|
elif value > self.maxval:
|
|
|
|
value = self.maxval
|
|
|
|
self.curval = value
|
|
|
|
self._update(value)
|
|
|
|
|
|
|
|
def inc(self, n=1):
|
|
|
|
"""inc(amt) - Increment progress bar position"""
|
|
|
|
self.set(self.curval + n)
|
1997-05-12 12:44:14 -03:00
|
|
|
|
2000-09-19 19:42:38 -03:00
|
|
|
ARGV_ID=265
|
|
|
|
ARGV_ITEM_OK=1
|
|
|
|
ARGV_ITEM_CANCEL=2
|
|
|
|
ARGV_OPTION_GROUP=3
|
|
|
|
ARGV_OPTION_EXPLAIN=4
|
|
|
|
ARGV_OPTION_VALUE=5
|
|
|
|
ARGV_OPTION_ADD=6
|
|
|
|
ARGV_COMMAND_GROUP=7
|
|
|
|
ARGV_COMMAND_EXPLAIN=8
|
|
|
|
ARGV_COMMAND_ADD=9
|
|
|
|
ARGV_ADD_OLDFILE=10
|
|
|
|
ARGV_ADD_NEWFILE=11
|
|
|
|
ARGV_ADD_FOLDER=12
|
|
|
|
ARGV_CMDLINE_GROUP=13
|
|
|
|
ARGV_CMDLINE_DATA=14
|
|
|
|
|
|
|
|
##def _myModalDialog(d):
|
2003-04-06 06:01:11 -03:00
|
|
|
## while 1:
|
2003-06-21 11:41:32 -03:00
|
|
|
## ready, ev = Evt.WaitNextEvent(0xffff, -1)
|
|
|
|
## print 'DBG: WNE', ready, ev
|
|
|
|
## if ready :
|
|
|
|
## what,msg,when,where,mod = ev
|
|
|
|
## part, window = Win.FindWindow(where)
|
|
|
|
## if Dlg.IsDialogEvent(ev):
|
|
|
|
## didit, dlgdone, itemdone = Dlg.DialogSelect(ev)
|
|
|
|
## print 'DBG: DialogSelect', didit, dlgdone, itemdone, d
|
|
|
|
## if didit and dlgdone == d:
|
|
|
|
## return itemdone
|
|
|
|
## elif window == d.GetDialogWindow():
|
|
|
|
## d.GetDialogWindow().SelectWindow()
|
|
|
|
## if part == 4: # inDrag
|
|
|
|
## d.DragWindow(where, screenbounds)
|
|
|
|
## else:
|
|
|
|
## MacOS.HandleEvent(ev)
|
|
|
|
## else:
|
|
|
|
## MacOS.HandleEvent(ev)
|
2000-09-19 19:42:38 -03:00
|
|
|
##
|
|
|
|
def _setmenu(control, items):
|
2004-07-18 03:16:08 -03:00
|
|
|
mhandle = control.GetControlData_Handle(Controls.kControlMenuPart,
|
|
|
|
Controls.kControlPopupButtonMenuHandleTag)
|
|
|
|
menu = Menu.as_Menu(mhandle)
|
|
|
|
for item in items:
|
|
|
|
if type(item) == type(()):
|
|
|
|
label = item[0]
|
|
|
|
else:
|
|
|
|
label = item
|
|
|
|
if label[-1] == '=' or label[-1] == ':':
|
|
|
|
label = label[:-1]
|
|
|
|
menu.AppendMenu(label)
|
2003-06-21 11:41:32 -03:00
|
|
|
## mhandle, mid = menu.getpopupinfo()
|
|
|
|
## control.SetControlData_Handle(Controls.kControlMenuPart,
|
|
|
|
## Controls.kControlPopupButtonMenuHandleTag, mhandle)
|
2004-07-18 03:16:08 -03:00
|
|
|
control.SetControlMinimum(1)
|
|
|
|
control.SetControlMaximum(len(items)+1)
|
2003-04-06 06:01:11 -03:00
|
|
|
|
2000-09-19 19:42:38 -03:00
|
|
|
def _selectoption(d, optionlist, idx):
|
2003-06-21 11:41:32 -03:00
|
|
|
if idx < 0 or idx >= len(optionlist):
|
|
|
|
MacOS.SysBeep()
|
|
|
|
return
|
|
|
|
option = optionlist[idx]
|
|
|
|
if type(option) == type(()):
|
|
|
|
if len(option) == 4:
|
|
|
|
help = option[2]
|
|
|
|
elif len(option) > 1:
|
|
|
|
help = option[-1]
|
2003-04-06 06:01:11 -03:00
|
|
|
else:
|
2003-06-21 11:41:32 -03:00
|
|
|
help = ''
|
|
|
|
else:
|
|
|
|
help = ''
|
|
|
|
h = d.GetDialogItemAsControl(ARGV_OPTION_EXPLAIN)
|
|
|
|
if help and len(help) > 250:
|
|
|
|
help = help[:250] + '...'
|
|
|
|
Dlg.SetDialogItemText(h, help)
|
|
|
|
hasvalue = 0
|
|
|
|
if type(option) == type(()):
|
|
|
|
label = option[0]
|
|
|
|
else:
|
|
|
|
label = option
|
|
|
|
if label[-1] == '=' or label[-1] == ':':
|
|
|
|
hasvalue = 1
|
|
|
|
h = d.GetDialogItemAsControl(ARGV_OPTION_VALUE)
|
|
|
|
Dlg.SetDialogItemText(h, '')
|
|
|
|
if hasvalue:
|
|
|
|
d.ShowDialogItem(ARGV_OPTION_VALUE)
|
|
|
|
d.SelectDialogItemText(ARGV_OPTION_VALUE, 0, 0)
|
|
|
|
else:
|
|
|
|
d.HideDialogItem(ARGV_OPTION_VALUE)
|
2000-09-19 19:42:38 -03:00
|
|
|
|
|
|
|
|
|
|
|
def GetArgv(optionlist=None, commandlist=None, addoldfile=1, addnewfile=1, addfolder=1, id=ARGV_ID):
|
2003-06-21 11:41:32 -03:00
|
|
|
_initialize()
|
|
|
|
_interact()
|
|
|
|
d = GetNewDialog(id, -1)
|
|
|
|
if not d:
|
2007-02-09 01:37:30 -04:00
|
|
|
print("EasyDialogs: Can't get DLOG resource with id =", id, " (missing resource file?)")
|
2003-06-21 11:41:32 -03:00
|
|
|
return
|
2003-04-06 06:01:11 -03:00
|
|
|
# h = d.GetDialogItemAsControl(3)
|
|
|
|
# SetDialogItemText(h, lf2cr(prompt))
|
|
|
|
# h = d.GetDialogItemAsControl(4)
|
|
|
|
# SetDialogItemText(h, lf2cr(default))
|
|
|
|
# d.SelectDialogItemText(4, 0, 999)
|
|
|
|
# d.SetDialogItem(4, 0, 255)
|
2003-06-21 11:41:32 -03:00
|
|
|
if optionlist:
|
|
|
|
_setmenu(d.GetDialogItemAsControl(ARGV_OPTION_GROUP), optionlist)
|
|
|
|
_selectoption(d, optionlist, 0)
|
|
|
|
else:
|
|
|
|
d.GetDialogItemAsControl(ARGV_OPTION_GROUP).DeactivateControl()
|
|
|
|
if commandlist:
|
|
|
|
_setmenu(d.GetDialogItemAsControl(ARGV_COMMAND_GROUP), commandlist)
|
|
|
|
if type(commandlist[0]) == type(()) and len(commandlist[0]) > 1:
|
|
|
|
help = commandlist[0][-1]
|
|
|
|
h = d.GetDialogItemAsControl(ARGV_COMMAND_EXPLAIN)
|
|
|
|
Dlg.SetDialogItemText(h, help)
|
|
|
|
else:
|
|
|
|
d.GetDialogItemAsControl(ARGV_COMMAND_GROUP).DeactivateControl()
|
|
|
|
if not addoldfile:
|
|
|
|
d.GetDialogItemAsControl(ARGV_ADD_OLDFILE).DeactivateControl()
|
|
|
|
if not addnewfile:
|
|
|
|
d.GetDialogItemAsControl(ARGV_ADD_NEWFILE).DeactivateControl()
|
|
|
|
if not addfolder:
|
|
|
|
d.GetDialogItemAsControl(ARGV_ADD_FOLDER).DeactivateControl()
|
|
|
|
d.SetDialogDefaultItem(ARGV_ITEM_OK)
|
|
|
|
d.SetDialogCancelItem(ARGV_ITEM_CANCEL)
|
|
|
|
d.GetDialogWindow().ShowWindow()
|
|
|
|
d.DrawDialog()
|
|
|
|
if hasattr(MacOS, 'SchedParams'):
|
|
|
|
appsw = MacOS.SchedParams(1, 0)
|
|
|
|
try:
|
|
|
|
while 1:
|
|
|
|
stringstoadd = []
|
|
|
|
n = ModalDialog(None)
|
|
|
|
if n == ARGV_ITEM_OK:
|
|
|
|
break
|
|
|
|
elif n == ARGV_ITEM_CANCEL:
|
|
|
|
raise SystemExit
|
|
|
|
elif n == ARGV_OPTION_GROUP:
|
|
|
|
idx = d.GetDialogItemAsControl(ARGV_OPTION_GROUP).GetControlValue()-1
|
|
|
|
_selectoption(d, optionlist, idx)
|
|
|
|
elif n == ARGV_OPTION_VALUE:
|
|
|
|
pass
|
|
|
|
elif n == ARGV_OPTION_ADD:
|
|
|
|
idx = d.GetDialogItemAsControl(ARGV_OPTION_GROUP).GetControlValue()-1
|
|
|
|
if 0 <= idx < len(optionlist):
|
|
|
|
option = optionlist[idx]
|
|
|
|
if type(option) == type(()):
|
|
|
|
option = option[0]
|
|
|
|
if option[-1] == '=' or option[-1] == ':':
|
|
|
|
option = option[:-1]
|
|
|
|
h = d.GetDialogItemAsControl(ARGV_OPTION_VALUE)
|
|
|
|
value = Dlg.GetDialogItemText(h)
|
|
|
|
else:
|
|
|
|
value = ''
|
|
|
|
if len(option) == 1:
|
|
|
|
stringtoadd = '-' + option
|
|
|
|
else:
|
|
|
|
stringtoadd = '--' + option
|
|
|
|
stringstoadd = [stringtoadd]
|
|
|
|
if value:
|
|
|
|
stringstoadd.append(value)
|
|
|
|
else:
|
|
|
|
MacOS.SysBeep()
|
|
|
|
elif n == ARGV_COMMAND_GROUP:
|
|
|
|
idx = d.GetDialogItemAsControl(ARGV_COMMAND_GROUP).GetControlValue()-1
|
|
|
|
if 0 <= idx < len(commandlist) and type(commandlist[idx]) == type(()) and \
|
|
|
|
len(commandlist[idx]) > 1:
|
|
|
|
help = commandlist[idx][-1]
|
|
|
|
h = d.GetDialogItemAsControl(ARGV_COMMAND_EXPLAIN)
|
|
|
|
Dlg.SetDialogItemText(h, help)
|
|
|
|
elif n == ARGV_COMMAND_ADD:
|
|
|
|
idx = d.GetDialogItemAsControl(ARGV_COMMAND_GROUP).GetControlValue()-1
|
|
|
|
if 0 <= idx < len(commandlist):
|
|
|
|
command = commandlist[idx]
|
|
|
|
if type(command) == type(()):
|
|
|
|
command = command[0]
|
|
|
|
stringstoadd = [command]
|
|
|
|
else:
|
|
|
|
MacOS.SysBeep()
|
|
|
|
elif n == ARGV_ADD_OLDFILE:
|
|
|
|
pathname = AskFileForOpen()
|
|
|
|
if pathname:
|
|
|
|
stringstoadd = [pathname]
|
|
|
|
elif n == ARGV_ADD_NEWFILE:
|
|
|
|
pathname = AskFileForSave()
|
|
|
|
if pathname:
|
|
|
|
stringstoadd = [pathname]
|
|
|
|
elif n == ARGV_ADD_FOLDER:
|
|
|
|
pathname = AskFolder()
|
|
|
|
if pathname:
|
|
|
|
stringstoadd = [pathname]
|
|
|
|
elif n == ARGV_CMDLINE_DATA:
|
|
|
|
pass # Nothing to do
|
|
|
|
else:
|
2007-08-22 21:01:55 -03:00
|
|
|
raise RuntimeError("Unknown dialog item %d"%n)
|
2003-06-21 11:41:32 -03:00
|
|
|
|
|
|
|
for stringtoadd in stringstoadd:
|
|
|
|
if '"' in stringtoadd or "'" in stringtoadd or " " in stringtoadd:
|
2004-02-12 13:35:32 -04:00
|
|
|
stringtoadd = repr(stringtoadd)
|
2003-04-06 06:01:11 -03:00
|
|
|
h = d.GetDialogItemAsControl(ARGV_CMDLINE_DATA)
|
|
|
|
oldstr = GetDialogItemText(h)
|
2003-06-21 11:41:32 -03:00
|
|
|
if oldstr and oldstr[-1] != ' ':
|
|
|
|
oldstr = oldstr + ' '
|
|
|
|
oldstr = oldstr + stringtoadd
|
|
|
|
if oldstr[-1] != ' ':
|
|
|
|
oldstr = oldstr + ' '
|
|
|
|
SetDialogItemText(h, oldstr)
|
|
|
|
d.SelectDialogItemText(ARGV_CMDLINE_DATA, 0x7fff, 0x7fff)
|
|
|
|
h = d.GetDialogItemAsControl(ARGV_CMDLINE_DATA)
|
|
|
|
oldstr = GetDialogItemText(h)
|
2007-04-17 05:48:32 -03:00
|
|
|
tmplist = oldstr.split()
|
2003-06-21 11:41:32 -03:00
|
|
|
newlist = []
|
|
|
|
while tmplist:
|
|
|
|
item = tmplist[0]
|
|
|
|
del tmplist[0]
|
|
|
|
if item[0] == '"':
|
|
|
|
while item[-1] != '"':
|
|
|
|
if not tmplist:
|
2007-08-22 21:01:55 -03:00
|
|
|
raise RuntimeError("Unterminated quoted argument")
|
2003-06-21 11:41:32 -03:00
|
|
|
item = item + ' ' + tmplist[0]
|
|
|
|
del tmplist[0]
|
|
|
|
item = item[1:-1]
|
|
|
|
if item[0] == "'":
|
|
|
|
while item[-1] != "'":
|
|
|
|
if not tmplist:
|
2007-08-22 21:01:55 -03:00
|
|
|
raise RuntimeError("Unterminated quoted argument")
|
2003-06-21 11:41:32 -03:00
|
|
|
item = item + ' ' + tmplist[0]
|
|
|
|
del tmplist[0]
|
|
|
|
item = item[1:-1]
|
|
|
|
newlist.append(item)
|
|
|
|
return newlist
|
|
|
|
finally:
|
|
|
|
if hasattr(MacOS, 'SchedParams'):
|
|
|
|
MacOS.SchedParams(*appsw)
|
|
|
|
del d
|
2003-01-17 12:04:39 -04:00
|
|
|
|
2003-01-21 10:38:32 -04:00
|
|
|
def _process_Nav_args(dftflags, **args):
|
2003-06-21 11:41:32 -03:00
|
|
|
import aepack
|
|
|
|
import Carbon.AE
|
|
|
|
import Carbon.File
|
|
|
|
for k in args.keys():
|
|
|
|
if args[k] is None:
|
|
|
|
del args[k]
|
|
|
|
# Set some defaults, and modify some arguments
|
2006-08-20 13:25:10 -03:00
|
|
|
if 'dialogOptionFlags' not in args:
|
2003-06-21 11:41:32 -03:00
|
|
|
args['dialogOptionFlags'] = dftflags
|
2006-08-20 13:25:10 -03:00
|
|
|
if 'defaultLocation' in args and \
|
2003-06-21 11:41:32 -03:00
|
|
|
not isinstance(args['defaultLocation'], Carbon.AE.AEDesc):
|
|
|
|
defaultLocation = args['defaultLocation']
|
|
|
|
if isinstance(defaultLocation, (Carbon.File.FSSpec, Carbon.File.FSRef)):
|
|
|
|
args['defaultLocation'] = aepack.pack(defaultLocation)
|
|
|
|
else:
|
|
|
|
defaultLocation = Carbon.File.FSRef(defaultLocation)
|
|
|
|
args['defaultLocation'] = aepack.pack(defaultLocation)
|
2006-08-20 13:25:10 -03:00
|
|
|
if 'typeList' in args and not isinstance(args['typeList'], Carbon.Res.ResourceType):
|
2003-06-21 11:41:32 -03:00
|
|
|
typeList = args['typeList'][:]
|
|
|
|
# Workaround for OSX typeless files:
|
|
|
|
if 'TEXT' in typeList and not '\0\0\0\0' in typeList:
|
|
|
|
typeList = typeList + ('\0\0\0\0',)
|
|
|
|
data = 'Pyth' + struct.pack("hh", 0, len(typeList))
|
|
|
|
for type in typeList:
|
|
|
|
data = data+type
|
|
|
|
args['typeList'] = Carbon.Res.Handle(data)
|
|
|
|
tpwanted = str
|
2006-08-20 13:25:10 -03:00
|
|
|
if 'wanted' in args:
|
2003-06-21 11:41:32 -03:00
|
|
|
tpwanted = args['wanted']
|
|
|
|
del args['wanted']
|
|
|
|
return args, tpwanted
|
2003-04-06 06:01:11 -03:00
|
|
|
|
2003-02-07 11:45:40 -04:00
|
|
|
def _dummy_Nav_eventproc(msg, data):
|
2003-06-21 11:41:32 -03:00
|
|
|
pass
|
2003-04-06 06:01:11 -03:00
|
|
|
|
2003-02-07 11:45:40 -04:00
|
|
|
_default_Nav_eventproc = _dummy_Nav_eventproc
|
|
|
|
|
|
|
|
def SetDefaultEventProc(proc):
|
2003-06-21 11:41:32 -03:00
|
|
|
global _default_Nav_eventproc
|
|
|
|
rv = _default_Nav_eventproc
|
|
|
|
if proc is None:
|
|
|
|
proc = _dummy_Nav_eventproc
|
|
|
|
_default_Nav_eventproc = proc
|
|
|
|
return rv
|
2003-04-06 06:01:11 -03:00
|
|
|
|
2003-01-21 10:38:32 -04:00
|
|
|
def AskFileForOpen(
|
2003-06-21 11:41:32 -03:00
|
|
|
message=None,
|
|
|
|
typeList=None,
|
|
|
|
# From here on the order is not documented
|
|
|
|
version=None,
|
|
|
|
defaultLocation=None,
|
|
|
|
dialogOptionFlags=None,
|
|
|
|
location=None,
|
|
|
|
clientName=None,
|
|
|
|
windowTitle=None,
|
|
|
|
actionButtonLabel=None,
|
|
|
|
cancelButtonLabel=None,
|
|
|
|
preferenceKey=None,
|
|
|
|
popupExtension=None,
|
|
|
|
eventProc=_dummy_Nav_eventproc,
|
|
|
|
previewProc=None,
|
|
|
|
filterProc=None,
|
|
|
|
wanted=None,
|
|
|
|
multiple=None):
|
|
|
|
"""Display a dialog asking the user for a file to open.
|
|
|
|
|
|
|
|
wanted is the return type wanted: FSSpec, FSRef, unicode or string (default)
|
|
|
|
the other arguments can be looked up in Apple's Navigation Services documentation"""
|
|
|
|
|
|
|
|
default_flags = 0x56 # Or 0xe4?
|
|
|
|
args, tpwanted = _process_Nav_args(default_flags, version=version,
|
|
|
|
defaultLocation=defaultLocation, dialogOptionFlags=dialogOptionFlags,
|
|
|
|
location=location,clientName=clientName,windowTitle=windowTitle,
|
|
|
|
actionButtonLabel=actionButtonLabel,cancelButtonLabel=cancelButtonLabel,
|
|
|
|
message=message,preferenceKey=preferenceKey,
|
|
|
|
popupExtension=popupExtension,eventProc=eventProc,previewProc=previewProc,
|
|
|
|
filterProc=filterProc,typeList=typeList,wanted=wanted,multiple=multiple)
|
|
|
|
_interact()
|
|
|
|
try:
|
|
|
|
rr = Nav.NavChooseFile(args)
|
|
|
|
good = 1
|
2007-01-10 12:19:56 -04:00
|
|
|
except Nav.error as arg:
|
2003-06-21 11:41:32 -03:00
|
|
|
if arg[0] != -128: # userCancelledErr
|
2007-08-22 21:01:55 -03:00
|
|
|
raise Nav.error(arg)
|
2003-06-21 11:41:32 -03:00
|
|
|
return None
|
|
|
|
if not rr.validRecord or not rr.selection:
|
|
|
|
return None
|
|
|
|
if issubclass(tpwanted, Carbon.File.FSRef):
|
|
|
|
return tpwanted(rr.selection_fsr[0])
|
|
|
|
if issubclass(tpwanted, Carbon.File.FSSpec):
|
|
|
|
return tpwanted(rr.selection[0])
|
|
|
|
if issubclass(tpwanted, str):
|
|
|
|
return tpwanted(rr.selection_fsr[0].as_pathname())
|
2007-05-02 16:09:54 -03:00
|
|
|
if issubclass(tpwanted, str):
|
2003-06-21 11:41:32 -03:00
|
|
|
return tpwanted(rr.selection_fsr[0].as_pathname(), 'utf8')
|
2007-08-22 21:01:55 -03:00
|
|
|
raise TypeError("Unknown value for argument 'wanted': %s" % repr(tpwanted))
|
2003-01-17 12:04:39 -04:00
|
|
|
|
2003-01-21 10:38:32 -04:00
|
|
|
def AskFileForSave(
|
2003-06-21 11:41:32 -03:00
|
|
|
message=None,
|
|
|
|
savedFileName=None,
|
|
|
|
# From here on the order is not documented
|
|
|
|
version=None,
|
|
|
|
defaultLocation=None,
|
|
|
|
dialogOptionFlags=None,
|
|
|
|
location=None,
|
|
|
|
clientName=None,
|
|
|
|
windowTitle=None,
|
|
|
|
actionButtonLabel=None,
|
|
|
|
cancelButtonLabel=None,
|
|
|
|
preferenceKey=None,
|
|
|
|
popupExtension=None,
|
|
|
|
eventProc=_dummy_Nav_eventproc,
|
|
|
|
fileType=None,
|
|
|
|
fileCreator=None,
|
|
|
|
wanted=None,
|
|
|
|
multiple=None):
|
|
|
|
"""Display a dialog asking the user for a filename to save to.
|
|
|
|
|
|
|
|
wanted is the return type wanted: FSSpec, FSRef, unicode or string (default)
|
|
|
|
the other arguments can be looked up in Apple's Navigation Services documentation"""
|
|
|
|
|
|
|
|
|
|
|
|
default_flags = 0x07
|
|
|
|
args, tpwanted = _process_Nav_args(default_flags, version=version,
|
|
|
|
defaultLocation=defaultLocation, dialogOptionFlags=dialogOptionFlags,
|
|
|
|
location=location,clientName=clientName,windowTitle=windowTitle,
|
|
|
|
actionButtonLabel=actionButtonLabel,cancelButtonLabel=cancelButtonLabel,
|
|
|
|
savedFileName=savedFileName,message=message,preferenceKey=preferenceKey,
|
|
|
|
popupExtension=popupExtension,eventProc=eventProc,fileType=fileType,
|
|
|
|
fileCreator=fileCreator,wanted=wanted,multiple=multiple)
|
|
|
|
_interact()
|
|
|
|
try:
|
|
|
|
rr = Nav.NavPutFile(args)
|
|
|
|
good = 1
|
2007-01-10 12:19:56 -04:00
|
|
|
except Nav.error as arg:
|
2003-06-21 11:41:32 -03:00
|
|
|
if arg[0] != -128: # userCancelledErr
|
2007-08-22 21:01:55 -03:00
|
|
|
raise Nav.error(arg)
|
2003-06-21 11:41:32 -03:00
|
|
|
return None
|
|
|
|
if not rr.validRecord or not rr.selection:
|
|
|
|
return None
|
|
|
|
if issubclass(tpwanted, Carbon.File.FSRef):
|
2007-08-22 21:01:55 -03:00
|
|
|
raise TypeError("Cannot pass wanted=FSRef to AskFileForSave")
|
2003-06-21 11:41:32 -03:00
|
|
|
if issubclass(tpwanted, Carbon.File.FSSpec):
|
|
|
|
return tpwanted(rr.selection[0])
|
2007-05-03 18:05:51 -03:00
|
|
|
if issubclass(tpwanted, str):
|
2003-06-21 11:41:32 -03:00
|
|
|
if sys.platform == 'mac':
|
|
|
|
fullpath = rr.selection[0].as_pathname()
|
|
|
|
else:
|
|
|
|
# This is gross, and probably incorrect too
|
|
|
|
vrefnum, dirid, name = rr.selection[0].as_tuple()
|
|
|
|
pardir_fss = Carbon.File.FSSpec((vrefnum, dirid, ''))
|
|
|
|
pardir_fsr = Carbon.File.FSRef(pardir_fss)
|
|
|
|
pardir_path = pardir_fsr.FSRefMakePath() # This is utf-8
|
2007-05-02 16:09:54 -03:00
|
|
|
name_utf8 = str(name, 'macroman').encode('utf8')
|
2003-06-21 11:41:32 -03:00
|
|
|
fullpath = os.path.join(pardir_path, name_utf8)
|
2007-05-02 16:09:54 -03:00
|
|
|
if issubclass(tpwanted, str):
|
|
|
|
return str(fullpath, 'utf8')
|
2003-06-21 11:41:32 -03:00
|
|
|
return tpwanted(fullpath)
|
2007-08-22 21:01:55 -03:00
|
|
|
raise TypeError("Unknown value for argument 'wanted': %s" % repr(tpwanted))
|
2003-04-06 06:01:11 -03:00
|
|
|
|
2003-01-21 10:38:32 -04:00
|
|
|
def AskFolder(
|
2003-06-21 11:41:32 -03:00
|
|
|
message=None,
|
|
|
|
# From here on the order is not documented
|
|
|
|
version=None,
|
|
|
|
defaultLocation=None,
|
|
|
|
dialogOptionFlags=None,
|
|
|
|
location=None,
|
|
|
|
clientName=None,
|
|
|
|
windowTitle=None,
|
|
|
|
actionButtonLabel=None,
|
|
|
|
cancelButtonLabel=None,
|
|
|
|
preferenceKey=None,
|
|
|
|
popupExtension=None,
|
|
|
|
eventProc=_dummy_Nav_eventproc,
|
|
|
|
filterProc=None,
|
|
|
|
wanted=None,
|
|
|
|
multiple=None):
|
|
|
|
"""Display a dialog asking the user for select a folder.
|
|
|
|
|
|
|
|
wanted is the return type wanted: FSSpec, FSRef, unicode or string (default)
|
|
|
|
the other arguments can be looked up in Apple's Navigation Services documentation"""
|
|
|
|
|
|
|
|
default_flags = 0x17
|
|
|
|
args, tpwanted = _process_Nav_args(default_flags, version=version,
|
|
|
|
defaultLocation=defaultLocation, dialogOptionFlags=dialogOptionFlags,
|
|
|
|
location=location,clientName=clientName,windowTitle=windowTitle,
|
|
|
|
actionButtonLabel=actionButtonLabel,cancelButtonLabel=cancelButtonLabel,
|
|
|
|
message=message,preferenceKey=preferenceKey,
|
|
|
|
popupExtension=popupExtension,eventProc=eventProc,filterProc=filterProc,
|
|
|
|
wanted=wanted,multiple=multiple)
|
|
|
|
_interact()
|
|
|
|
try:
|
|
|
|
rr = Nav.NavChooseFolder(args)
|
|
|
|
good = 1
|
2007-01-10 12:19:56 -04:00
|
|
|
except Nav.error as arg:
|
2003-06-21 11:41:32 -03:00
|
|
|
if arg[0] != -128: # userCancelledErr
|
2007-08-22 21:01:55 -03:00
|
|
|
raise Nav.error(arg)
|
2003-06-21 11:41:32 -03:00
|
|
|
return None
|
|
|
|
if not rr.validRecord or not rr.selection:
|
|
|
|
return None
|
|
|
|
if issubclass(tpwanted, Carbon.File.FSRef):
|
|
|
|
return tpwanted(rr.selection_fsr[0])
|
|
|
|
if issubclass(tpwanted, Carbon.File.FSSpec):
|
|
|
|
return tpwanted(rr.selection[0])
|
|
|
|
if issubclass(tpwanted, str):
|
|
|
|
return tpwanted(rr.selection_fsr[0].as_pathname())
|
2007-05-02 16:09:54 -03:00
|
|
|
if issubclass(tpwanted, str):
|
2003-06-21 11:41:32 -03:00
|
|
|
return tpwanted(rr.selection_fsr[0].as_pathname(), 'utf8')
|
2007-08-22 21:01:55 -03:00
|
|
|
raise TypeError("Unknown value for argument 'wanted': %s" % repr(tpwanted))
|
2003-04-06 06:01:11 -03:00
|
|
|
|
2003-01-17 12:04:39 -04:00
|
|
|
|
1995-04-05 06:18:35 -03:00
|
|
|
def test():
|
2003-06-21 11:41:32 -03:00
|
|
|
import time
|
|
|
|
|
|
|
|
Message("Testing EasyDialogs.")
|
|
|
|
optionlist = (('v', 'Verbose'), ('verbose', 'Verbose as long option'),
|
|
|
|
('flags=', 'Valued option'), ('f:', 'Short valued option'))
|
|
|
|
commandlist = (('start', 'Start something'), ('stop', 'Stop something'))
|
|
|
|
argv = GetArgv(optionlist=optionlist, commandlist=commandlist, addoldfile=0)
|
|
|
|
Message("Command line: %s"%' '.join(argv))
|
|
|
|
for i in range(len(argv)):
|
2007-02-09 01:37:30 -04:00
|
|
|
print('arg[%d] = %r' % (i, argv[i]))
|
2003-06-21 11:41:32 -03:00
|
|
|
ok = AskYesNoCancel("Do you want to proceed?")
|
|
|
|
ok = AskYesNoCancel("Do you want to identify?", yes="Identify", no="No")
|
|
|
|
if ok > 0:
|
|
|
|
s = AskString("Enter your first name", "Joe")
|
|
|
|
s2 = AskPassword("Okay %s, tell us your nickname"%s, s, cancel="None")
|
|
|
|
if not s2:
|
|
|
|
Message("%s has no secret nickname"%s)
|
2003-04-06 06:01:11 -03:00
|
|
|
else:
|
2003-06-21 11:41:32 -03:00
|
|
|
Message("Hello everybody!!\nThe secret nickname of %s is %s!!!"%(s, s2))
|
|
|
|
else:
|
|
|
|
s = 'Anonymous'
|
|
|
|
rv = AskFileForOpen(message="Gimme a file, %s"%s, wanted=Carbon.File.FSSpec)
|
|
|
|
Message("rv: %s"%rv)
|
|
|
|
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)
|
|
|
|
text = ( "Working Hard...", "Hardly Working..." ,
|
|
|
|
"So far, so good!", "Keep on truckin'" )
|
|
|
|
bar = ProgressBar("Progress, progress...", 0, label="Ramping up...")
|
|
|
|
try:
|
|
|
|
if hasattr(MacOS, 'SchedParams'):
|
|
|
|
appsw = MacOS.SchedParams(1, 0)
|
2007-05-07 19:24:25 -03:00
|
|
|
for i in range(20):
|
2003-06-21 11:41:32 -03:00
|
|
|
bar.inc()
|
|
|
|
time.sleep(0.05)
|
|
|
|
bar.set(0,100)
|
2007-05-07 19:24:25 -03:00
|
|
|
for i in range(100):
|
2003-06-21 11:41:32 -03:00
|
|
|
bar.set(i)
|
|
|
|
time.sleep(0.05)
|
|
|
|
if i % 10 == 0:
|
|
|
|
bar.label(text[(i/10) % 4])
|
|
|
|
bar.label("Done.")
|
|
|
|
time.sleep(1.0) # give'em a chance to see "Done."
|
|
|
|
finally:
|
|
|
|
del bar
|
|
|
|
if hasattr(MacOS, 'SchedParams'):
|
|
|
|
MacOS.SchedParams(*appsw)
|
1995-04-05 06:18:35 -03:00
|
|
|
|
|
|
|
if __name__ == '__main__':
|
2003-06-21 11:41:32 -03:00
|
|
|
try:
|
|
|
|
test()
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
Message("Operation Canceled.")
|