2000-08-14 22:13:23 -03:00
|
|
|
import os
|
2002-09-16 19:03:37 -03:00
|
|
|
import types
|
|
|
|
import sys
|
|
|
|
import codecs
|
2002-06-11 01:45:34 -03:00
|
|
|
import tempfile
|
2008-05-17 15:39:55 -03:00
|
|
|
import tkinter.filedialog as tkFileDialog
|
|
|
|
import tkinter.messagebox as tkMessageBox
|
2000-08-14 22:13:23 -03:00
|
|
|
import re
|
2008-05-17 15:39:55 -03:00
|
|
|
from tkinter import *
|
|
|
|
from tkinter.simpledialog import SimpleDialog
|
2000-08-14 22:13:23 -03:00
|
|
|
|
2007-08-22 15:06:14 -03:00
|
|
|
from idlelib.configHandler import idleConf
|
2000-08-14 22:13:23 -03:00
|
|
|
|
2007-09-01 16:47:39 -03:00
|
|
|
from codecs import BOM_UTF8
|
2002-09-16 19:03:37 -03:00
|
|
|
|
|
|
|
# Try setting the locale, so that we can find out
|
|
|
|
# what encoding to use
|
|
|
|
try:
|
|
|
|
import locale
|
|
|
|
locale.setlocale(locale.LC_CTYPE, "")
|
2003-11-25 01:01:00 -04:00
|
|
|
except (ImportError, locale.Error):
|
2002-09-16 19:03:37 -03:00
|
|
|
pass
|
|
|
|
|
2005-11-27 12:59:04 -04:00
|
|
|
# Encoding for file names
|
2007-09-07 02:06:21 -03:00
|
|
|
filesystemencoding = sys.getfilesystemencoding() ### currently unused
|
2005-11-27 12:59:04 -04:00
|
|
|
|
2007-09-07 02:06:21 -03:00
|
|
|
locale_encoding = 'ascii'
|
2002-09-16 19:03:37 -03:00
|
|
|
if sys.platform == 'win32':
|
|
|
|
# On Windows, we could use "mbcs". However, to give the user
|
|
|
|
# a portable encoding name, we need to find the code page
|
|
|
|
try:
|
2007-09-07 02:06:21 -03:00
|
|
|
locale_encoding = locale.getdefaultlocale()[1]
|
|
|
|
codecs.lookup(locale_encoding)
|
2002-09-16 19:03:37 -03:00
|
|
|
except LookupError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
try:
|
|
|
|
# Different things can fail here: the locale module may not be
|
|
|
|
# loaded, it may not offer nl_langinfo, or CODESET, or the
|
|
|
|
# resulting codeset may be unknown to Python. We ignore all
|
|
|
|
# these problems, falling back to ASCII
|
2007-09-07 02:06:21 -03:00
|
|
|
locale_encoding = locale.nl_langinfo(locale.CODESET)
|
|
|
|
if locale_encoding is None or locale_encoding is '':
|
2002-09-22 22:01:20 -03:00
|
|
|
# situation occurs on Mac OS X
|
2007-09-07 02:06:21 -03:00
|
|
|
locale_encoding = 'ascii'
|
|
|
|
codecs.lookup(locale_encoding)
|
2002-09-16 19:03:37 -03:00
|
|
|
except (NameError, AttributeError, LookupError):
|
2007-09-07 02:06:21 -03:00
|
|
|
# Try getdefaultlocale: it parses environment variables,
|
2002-09-16 19:03:37 -03:00
|
|
|
# which may give a clue. Unfortunately, getdefaultlocale has
|
|
|
|
# bugs that can cause ValueError.
|
|
|
|
try:
|
2007-09-07 02:06:21 -03:00
|
|
|
locale_encoding = locale.getdefaultlocale()[1]
|
|
|
|
if locale_encoding is None or locale_encoding is '':
|
2002-09-22 22:01:20 -03:00
|
|
|
# situation occurs on Mac OS X
|
2007-09-07 02:06:21 -03:00
|
|
|
locale_encoding = 'ascii'
|
|
|
|
codecs.lookup(locale_encoding)
|
2002-09-16 19:03:37 -03:00
|
|
|
except (ValueError, LookupError):
|
|
|
|
pass
|
|
|
|
|
2007-09-07 02:06:21 -03:00
|
|
|
locale_encoding = locale_encoding.lower()
|
|
|
|
|
|
|
|
encoding = locale_encoding ### KBK 07Sep07 This is used all over IDLE, check!
|
|
|
|
### 'encoding' is used below in encode(), check!
|
2002-09-16 19:03:37 -03:00
|
|
|
|
|
|
|
coding_re = re.compile("coding[:=]\s*([-\w_.]+)")
|
|
|
|
|
2003-05-09 21:49:56 -03:00
|
|
|
class EncodingMessage(SimpleDialog):
|
|
|
|
"Inform user that an encoding declaration is needed."
|
|
|
|
def __init__(self, master, enc):
|
|
|
|
self.should_edit = False
|
2003-05-17 23:24:32 -03:00
|
|
|
|
2003-05-09 21:49:56 -03:00
|
|
|
self.root = top = Toplevel(master)
|
|
|
|
top.bind("<Return>", self.return_event)
|
|
|
|
top.bind("<Escape>", self.do_ok)
|
|
|
|
top.protocol("WM_DELETE_WINDOW", self.wm_delete_window)
|
|
|
|
top.wm_title("I/O Warning")
|
|
|
|
top.wm_iconname("I/O Warning")
|
|
|
|
self.top = top
|
|
|
|
|
|
|
|
l1 = Label(top,
|
|
|
|
text="Non-ASCII found, yet no encoding declared. Add a line like")
|
|
|
|
l1.pack(side=TOP, anchor=W)
|
|
|
|
l2 = Entry(top, font="courier")
|
|
|
|
l2.insert(0, "# -*- coding: %s -*-" % enc)
|
|
|
|
# For some reason, the text is not selectable anymore if the
|
|
|
|
# widget is disabled.
|
|
|
|
# l2['state'] = DISABLED
|
|
|
|
l2.pack(side=TOP, anchor = W, fill=X)
|
|
|
|
l3 = Label(top, text="to your file\n"
|
|
|
|
"Choose OK to save this file as %s\n"
|
|
|
|
"Edit your general options to silence this warning" % enc)
|
|
|
|
l3.pack(side=TOP, anchor = W)
|
|
|
|
|
|
|
|
buttons = Frame(top)
|
|
|
|
buttons.pack(side=TOP, fill=X)
|
|
|
|
# Both return and cancel mean the same thing: do nothing
|
|
|
|
self.default = self.cancel = 0
|
|
|
|
b1 = Button(buttons, text="Ok", default="active",
|
|
|
|
command=self.do_ok)
|
|
|
|
b1.pack(side=LEFT, fill=BOTH, expand=1)
|
|
|
|
b2 = Button(buttons, text="Edit my file",
|
|
|
|
command=self.do_edit)
|
|
|
|
b2.pack(side=LEFT, fill=BOTH, expand=1)
|
2003-05-17 23:24:32 -03:00
|
|
|
|
2003-05-09 21:49:56 -03:00
|
|
|
self._set_transient(master)
|
|
|
|
|
|
|
|
def do_ok(self):
|
|
|
|
self.done(0)
|
|
|
|
|
|
|
|
def do_edit(self):
|
|
|
|
self.done(1)
|
|
|
|
|
2007-09-01 16:47:39 -03:00
|
|
|
def coding_spec(data):
|
2002-09-16 19:03:37 -03:00
|
|
|
"""Return the encoding declaration according to PEP 263.
|
|
|
|
|
2007-09-07 02:06:21 -03:00
|
|
|
When checking encoded data, only the first two lines should be passed
|
|
|
|
in to avoid a UnicodeDecodeError if the rest of the data is not unicode.
|
|
|
|
The first two lines would contain the encoding specification.
|
|
|
|
|
|
|
|
Raise a LookupError if the encoding is declared but unknown.
|
2002-12-14 00:38:51 -04:00
|
|
|
"""
|
2007-09-01 16:47:39 -03:00
|
|
|
if isinstance(data, bytes):
|
2007-09-07 02:06:21 -03:00
|
|
|
try:
|
|
|
|
lines = data.decode('utf-8')
|
|
|
|
except UnicodeDecodeError:
|
|
|
|
return None
|
2007-09-01 16:47:39 -03:00
|
|
|
else:
|
2007-09-07 02:06:21 -03:00
|
|
|
lines = data
|
|
|
|
# consider only the first two lines
|
|
|
|
if '\n' in lines:
|
|
|
|
lst = lines.split('\n')[:2]
|
|
|
|
elif '\r' in lines:
|
|
|
|
lst = lines.split('\r')[:2]
|
|
|
|
else:
|
|
|
|
lst = list(lines)
|
|
|
|
str = '\n'.join(lst)
|
2002-09-16 19:03:37 -03:00
|
|
|
match = coding_re.search(str)
|
|
|
|
if not match:
|
|
|
|
return None
|
|
|
|
name = match.group(1)
|
|
|
|
try:
|
|
|
|
codecs.lookup(name)
|
|
|
|
except LookupError:
|
|
|
|
# The standard encoding error does not indicate the encoding
|
2007-09-07 02:06:21 -03:00
|
|
|
raise LookupError("Unknown encoding: "+name)
|
2002-09-16 19:03:37 -03:00
|
|
|
return name
|
2000-08-14 22:13:23 -03:00
|
|
|
|
2002-12-14 00:38:51 -04:00
|
|
|
|
2000-08-14 22:13:23 -03:00
|
|
|
class IOBinding:
|
|
|
|
|
|
|
|
def __init__(self, editwin):
|
|
|
|
self.editwin = editwin
|
|
|
|
self.text = editwin.text
|
|
|
|
self.__id_open = self.text.bind("<<open-window-from-file>>", self.open)
|
|
|
|
self.__id_save = self.text.bind("<<save-window>>", self.save)
|
|
|
|
self.__id_saveas = self.text.bind("<<save-window-as-file>>",
|
|
|
|
self.save_as)
|
|
|
|
self.__id_savecopy = self.text.bind("<<save-copy-of-window-as-file>>",
|
|
|
|
self.save_a_copy)
|
2002-09-16 19:03:37 -03:00
|
|
|
self.fileencoding = None
|
2002-06-11 01:45:34 -03:00
|
|
|
self.__id_print = self.text.bind("<<print-window>>", self.print_window)
|
2002-12-31 12:03:23 -04:00
|
|
|
|
2000-08-14 22:13:23 -03:00
|
|
|
def close(self):
|
|
|
|
# Undo command bindings
|
|
|
|
self.text.unbind("<<open-window-from-file>>", self.__id_open)
|
|
|
|
self.text.unbind("<<save-window>>", self.__id_save)
|
|
|
|
self.text.unbind("<<save-window-as-file>>",self.__id_saveas)
|
|
|
|
self.text.unbind("<<save-copy-of-window-as-file>>", self.__id_savecopy)
|
2002-06-11 01:45:34 -03:00
|
|
|
self.text.unbind("<<print-window>>", self.__id_print)
|
2000-08-14 22:13:23 -03:00
|
|
|
# Break cycles
|
|
|
|
self.editwin = None
|
|
|
|
self.text = None
|
|
|
|
self.filename_change_hook = None
|
|
|
|
|
|
|
|
def get_saved(self):
|
|
|
|
return self.editwin.get_saved()
|
|
|
|
|
|
|
|
def set_saved(self, flag):
|
|
|
|
self.editwin.set_saved(flag)
|
|
|
|
|
|
|
|
def reset_undo(self):
|
|
|
|
self.editwin.reset_undo()
|
|
|
|
|
|
|
|
filename_change_hook = None
|
|
|
|
|
|
|
|
def set_filename_change_hook(self, hook):
|
|
|
|
self.filename_change_hook = hook
|
|
|
|
|
|
|
|
filename = None
|
2003-06-04 23:34:04 -03:00
|
|
|
dirname = None
|
2000-08-14 22:13:23 -03:00
|
|
|
|
|
|
|
def set_filename(self, filename):
|
2003-06-04 23:34:04 -03:00
|
|
|
if filename and os.path.isdir(filename):
|
|
|
|
self.filename = None
|
|
|
|
self.dirname = filename
|
|
|
|
else:
|
|
|
|
self.filename = filename
|
|
|
|
self.dirname = None
|
|
|
|
self.set_saved(1)
|
|
|
|
if self.filename_change_hook:
|
|
|
|
self.filename_change_hook()
|
2000-08-14 22:13:23 -03:00
|
|
|
|
2002-03-27 04:40:46 -04:00
|
|
|
def open(self, event=None, editFile=None):
|
2000-08-14 22:13:23 -03:00
|
|
|
if self.editwin.flist:
|
2002-03-27 04:40:46 -04:00
|
|
|
if not editFile:
|
|
|
|
filename = self.askopenfile()
|
|
|
|
else:
|
|
|
|
filename=editFile
|
2000-08-14 22:13:23 -03:00
|
|
|
if filename:
|
2002-07-20 22:24:28 -03:00
|
|
|
# If the current window has no filename and hasn't been
|
|
|
|
# modified, we replace its contents (no loss). Otherwise
|
|
|
|
# we open a new window. But we won't replace the
|
|
|
|
# shell window (which has an interp(reter) attribute), which
|
|
|
|
# gets set to "not modified" at every new prompt.
|
|
|
|
try:
|
|
|
|
interp = self.editwin.interp
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 11:07:44 -04:00
|
|
|
except AttributeError:
|
2002-07-20 22:24:28 -03:00
|
|
|
interp = None
|
|
|
|
if not self.filename and self.get_saved() and not interp:
|
2000-08-14 22:13:23 -03:00
|
|
|
self.editwin.flist.open(filename, self.loadfile)
|
|
|
|
else:
|
|
|
|
self.editwin.flist.open(filename)
|
|
|
|
else:
|
|
|
|
self.text.focus_set()
|
|
|
|
return "break"
|
2002-07-20 22:24:28 -03:00
|
|
|
#
|
2000-08-14 22:13:23 -03:00
|
|
|
# Code for use outside IDLE:
|
|
|
|
if self.get_saved():
|
|
|
|
reply = self.maybesave()
|
|
|
|
if reply == "cancel":
|
|
|
|
self.text.focus_set()
|
|
|
|
return "break"
|
2002-03-27 04:40:46 -04:00
|
|
|
if not editFile:
|
|
|
|
filename = self.askopenfile()
|
|
|
|
else:
|
|
|
|
filename=editFile
|
2000-08-14 22:13:23 -03:00
|
|
|
if filename:
|
|
|
|
self.loadfile(filename)
|
|
|
|
else:
|
|
|
|
self.text.focus_set()
|
|
|
|
return "break"
|
|
|
|
|
2003-04-25 15:36:31 -03:00
|
|
|
eol = r"(\r\n)|\n|\r" # \r\n (Windows), \n (UNIX), or \r (Mac)
|
|
|
|
eol_re = re.compile(eol)
|
2007-10-09 21:36:38 -03:00
|
|
|
eol_convention = os.linesep # default
|
2003-04-25 15:36:31 -03:00
|
|
|
|
2000-08-14 22:13:23 -03:00
|
|
|
def loadfile(self, filename):
|
|
|
|
try:
|
|
|
|
# open the file in binary mode so that we can handle
|
2007-08-22 15:06:14 -03:00
|
|
|
# end-of-line convention ourselves.
|
2000-08-14 22:13:23 -03:00
|
|
|
f = open(filename,'rb')
|
2007-09-07 02:06:21 -03:00
|
|
|
two_lines = f.readline() + f.readline()
|
|
|
|
f.seek(0)
|
2007-09-01 16:47:39 -03:00
|
|
|
bytes = f.read()
|
2000-08-14 22:13:23 -03:00
|
|
|
f.close()
|
2007-01-10 12:19:56 -04:00
|
|
|
except IOError as msg:
|
2000-08-14 22:13:23 -03:00
|
|
|
tkMessageBox.showerror("I/O Error", str(msg), master=self.text)
|
2002-09-16 19:03:37 -03:00
|
|
|
return False
|
2007-09-07 02:06:21 -03:00
|
|
|
chars = self._decode(two_lines, bytes)
|
|
|
|
if chars is None:
|
|
|
|
tkMessageBox.showerror("Decoding Error",
|
|
|
|
"File %s\nFailed to Decode" % filename,
|
|
|
|
parent=self.text)
|
|
|
|
return False
|
2000-08-14 22:13:23 -03:00
|
|
|
# We now convert all end-of-lines to '\n's
|
2003-04-25 15:36:31 -03:00
|
|
|
firsteol = self.eol_re.search(chars)
|
|
|
|
if firsteol:
|
|
|
|
self.eol_convention = firsteol.group(0)
|
|
|
|
chars = self.eol_re.sub(r"\n", chars)
|
2000-08-14 22:13:23 -03:00
|
|
|
self.text.delete("1.0", "end")
|
|
|
|
self.set_filename(None)
|
|
|
|
self.text.insert("1.0", chars)
|
|
|
|
self.reset_undo()
|
|
|
|
self.set_filename(filename)
|
|
|
|
self.text.mark_set("insert", "1.0")
|
|
|
|
self.text.see("insert")
|
2002-11-03 23:11:10 -04:00
|
|
|
self.updaterecentfileslist(filename)
|
2002-09-16 19:03:37 -03:00
|
|
|
return True
|
|
|
|
|
2007-09-07 02:06:21 -03:00
|
|
|
def _decode(self, two_lines, bytes):
|
|
|
|
"Create a Unicode string."
|
|
|
|
chars = None
|
2002-09-16 19:03:37 -03:00
|
|
|
# Check presence of a UTF-8 signature first
|
2007-09-07 02:06:21 -03:00
|
|
|
if bytes.startswith(BOM_UTF8):
|
2002-09-16 19:03:37 -03:00
|
|
|
try:
|
2007-09-07 02:06:21 -03:00
|
|
|
chars = bytes[3:].decode("utf-8")
|
|
|
|
except UnicodeDecodeError:
|
2002-09-16 19:03:37 -03:00
|
|
|
# has UTF-8 signature, but fails to decode...
|
2007-09-07 02:06:21 -03:00
|
|
|
return None
|
2002-09-16 19:03:37 -03:00
|
|
|
else:
|
|
|
|
# Indicates that this file originally had a BOM
|
2007-09-01 16:47:39 -03:00
|
|
|
self.fileencoding = 'BOM'
|
2002-09-16 19:03:37 -03:00
|
|
|
return chars
|
|
|
|
# Next look for coding specification
|
|
|
|
try:
|
2007-09-07 02:06:21 -03:00
|
|
|
enc = coding_spec(two_lines)
|
2007-01-10 12:19:56 -04:00
|
|
|
except LookupError as name:
|
2002-09-16 19:03:37 -03:00
|
|
|
tkMessageBox.showerror(
|
|
|
|
title="Error loading the file",
|
|
|
|
message="The encoding '%s' is not known to this Python "\
|
|
|
|
"installation. The file may not display correctly" % name,
|
|
|
|
master = self.text)
|
|
|
|
enc = None
|
2007-09-07 02:06:21 -03:00
|
|
|
except UnicodeDecodeError:
|
|
|
|
return None
|
2002-09-16 19:03:37 -03:00
|
|
|
if enc:
|
|
|
|
try:
|
2007-09-07 02:06:21 -03:00
|
|
|
chars = str(bytes, enc)
|
|
|
|
self.fileencoding = enc
|
|
|
|
return chars
|
|
|
|
except UnicodeDecodeError:
|
2002-09-16 19:03:37 -03:00
|
|
|
pass
|
2007-09-07 02:06:21 -03:00
|
|
|
# Try ascii:
|
2002-09-16 19:03:37 -03:00
|
|
|
try:
|
2007-09-07 02:06:21 -03:00
|
|
|
chars = str(bytes, 'ascii')
|
|
|
|
self.fileencoding = None
|
|
|
|
return chars
|
|
|
|
except UnicodeDecodeError:
|
|
|
|
pass
|
|
|
|
# Try utf-8:
|
|
|
|
try:
|
|
|
|
chars = str(bytes, 'utf-8')
|
|
|
|
self.fileencoding = 'utf-8'
|
|
|
|
return chars
|
|
|
|
except UnicodeDecodeError:
|
2002-09-16 19:03:37 -03:00
|
|
|
pass
|
|
|
|
# Finally, try the locale's encoding. This is deprecated;
|
|
|
|
# the user should declare a non-ASCII encoding
|
|
|
|
try:
|
2007-09-07 02:06:21 -03:00
|
|
|
chars = str(bytes, locale_encoding)
|
|
|
|
self.fileencoding = locale_encoding
|
|
|
|
except UnicodeDecodeError:
|
2002-09-16 19:03:37 -03:00
|
|
|
pass
|
2007-09-07 02:06:21 -03:00
|
|
|
return chars # None on failure
|
2000-08-14 22:13:23 -03:00
|
|
|
|
|
|
|
def maybesave(self):
|
|
|
|
if self.get_saved():
|
|
|
|
return "yes"
|
|
|
|
message = "Do you want to save %s before closing?" % (
|
|
|
|
self.filename or "this untitled document")
|
|
|
|
m = tkMessageBox.Message(
|
|
|
|
title="Save On Close",
|
|
|
|
message=message,
|
|
|
|
icon=tkMessageBox.QUESTION,
|
|
|
|
type=tkMessageBox.YESNOCANCEL,
|
|
|
|
master=self.text)
|
|
|
|
reply = m.show()
|
|
|
|
if reply == "yes":
|
|
|
|
self.save(None)
|
|
|
|
if not self.get_saved():
|
|
|
|
reply = "cancel"
|
|
|
|
self.text.focus_set()
|
|
|
|
return reply
|
|
|
|
|
|
|
|
def save(self, event):
|
|
|
|
if not self.filename:
|
|
|
|
self.save_as(event)
|
|
|
|
else:
|
|
|
|
if self.writefile(self.filename):
|
|
|
|
self.set_saved(1)
|
2003-03-04 00:42:04 -04:00
|
|
|
try:
|
|
|
|
self.editwin.store_file_breaks()
|
|
|
|
except AttributeError: # may be a PyShell
|
|
|
|
pass
|
2000-08-14 22:13:23 -03:00
|
|
|
self.text.focus_set()
|
|
|
|
return "break"
|
|
|
|
|
|
|
|
def save_as(self, event):
|
|
|
|
filename = self.asksavefile()
|
|
|
|
if filename:
|
|
|
|
if self.writefile(filename):
|
|
|
|
self.set_filename(filename)
|
|
|
|
self.set_saved(1)
|
2003-03-04 00:42:04 -04:00
|
|
|
try:
|
|
|
|
self.editwin.store_file_breaks()
|
|
|
|
except AttributeError:
|
|
|
|
pass
|
2000-08-14 22:13:23 -03:00
|
|
|
self.text.focus_set()
|
2002-11-03 23:11:10 -04:00
|
|
|
self.updaterecentfileslist(filename)
|
2000-08-14 22:13:23 -03:00
|
|
|
return "break"
|
|
|
|
|
|
|
|
def save_a_copy(self, event):
|
|
|
|
filename = self.asksavefile()
|
|
|
|
if filename:
|
|
|
|
self.writefile(filename)
|
|
|
|
self.text.focus_set()
|
2002-11-03 23:11:10 -04:00
|
|
|
self.updaterecentfileslist(filename)
|
2000-08-14 22:13:23 -03:00
|
|
|
return "break"
|
|
|
|
|
|
|
|
def writefile(self, filename):
|
|
|
|
self.fixlastline()
|
2007-10-09 20:12:31 -03:00
|
|
|
text = self.text.get("1.0", "end-1c")
|
2003-04-25 15:36:31 -03:00
|
|
|
if self.eol_convention != "\n":
|
2007-10-09 20:12:31 -03:00
|
|
|
text = text.replace("\n", self.eol_convention)
|
2007-10-14 23:40:08 -03:00
|
|
|
chars = self.encode(text)
|
2000-08-14 22:13:23 -03:00
|
|
|
try:
|
2003-04-25 15:36:31 -03:00
|
|
|
f = open(filename, "wb")
|
2000-08-14 22:13:23 -03:00
|
|
|
f.write(chars)
|
2006-04-21 07:40:58 -03:00
|
|
|
f.flush()
|
2000-08-14 22:13:23 -03:00
|
|
|
f.close()
|
2002-09-16 19:03:37 -03:00
|
|
|
return True
|
2007-01-10 12:19:56 -04:00
|
|
|
except IOError as msg:
|
2000-08-14 22:13:23 -03:00
|
|
|
tkMessageBox.showerror("I/O Error", str(msg),
|
|
|
|
master=self.text)
|
2002-09-16 19:03:37 -03:00
|
|
|
return False
|
|
|
|
|
|
|
|
def encode(self, chars):
|
2007-08-13 10:30:04 -03:00
|
|
|
if isinstance(chars, bytes):
|
2002-09-16 19:03:37 -03:00
|
|
|
# This is either plain ASCII, or Tk was returning mixed-encoding
|
|
|
|
# text to us. Don't try to guess further.
|
|
|
|
return chars
|
|
|
|
# See whether there is anything non-ASCII in it.
|
|
|
|
# If not, no need to figure out the encoding.
|
|
|
|
try:
|
|
|
|
return chars.encode('ascii')
|
|
|
|
except UnicodeError:
|
|
|
|
pass
|
2007-09-07 02:06:21 -03:00
|
|
|
# Check if there is an encoding declared
|
2002-09-16 19:03:37 -03:00
|
|
|
try:
|
2007-09-07 02:06:21 -03:00
|
|
|
# a string, let coding_spec slice it to the first two lines
|
2002-09-16 19:03:37 -03:00
|
|
|
enc = coding_spec(chars)
|
|
|
|
failed = None
|
2007-01-10 12:19:56 -04:00
|
|
|
except LookupError as msg:
|
2002-09-16 19:03:37 -03:00
|
|
|
failed = msg
|
|
|
|
enc = None
|
|
|
|
if enc:
|
|
|
|
try:
|
|
|
|
return chars.encode(enc)
|
|
|
|
except UnicodeError:
|
|
|
|
failed = "Invalid encoding '%s'" % enc
|
|
|
|
if failed:
|
|
|
|
tkMessageBox.showerror(
|
|
|
|
"I/O Error",
|
2007-09-01 16:47:39 -03:00
|
|
|
"%s.\nSaving as UTF-8" % failed,
|
2002-09-16 19:03:37 -03:00
|
|
|
master = self.text)
|
|
|
|
# If there was a UTF-8 signature, use that. This should not fail
|
2007-09-01 16:47:39 -03:00
|
|
|
if self.fileencoding == 'BOM' or failed:
|
2002-09-16 19:03:37 -03:00
|
|
|
return BOM_UTF8 + chars.encode("utf-8")
|
|
|
|
# Try the original file encoding next, if any
|
|
|
|
if self.fileencoding:
|
|
|
|
try:
|
|
|
|
return chars.encode(self.fileencoding)
|
|
|
|
except UnicodeError:
|
|
|
|
tkMessageBox.showerror(
|
|
|
|
"I/O Error",
|
|
|
|
"Cannot save this as '%s' anymore. Saving as UTF-8" \
|
|
|
|
% self.fileencoding,
|
|
|
|
master = self.text)
|
|
|
|
return BOM_UTF8 + chars.encode("utf-8")
|
|
|
|
# Nothing was declared, and we had not determined an encoding
|
|
|
|
# on loading. Recommend an encoding line.
|
2003-05-17 23:24:32 -03:00
|
|
|
config_encoding = idleConf.GetOption("main","EditorWindow",
|
|
|
|
"encoding")
|
|
|
|
if config_encoding == 'utf-8':
|
|
|
|
# User has requested that we save files as UTF-8
|
|
|
|
return BOM_UTF8 + chars.encode("utf-8")
|
|
|
|
ask_user = True
|
|
|
|
try:
|
|
|
|
chars = chars.encode(encoding)
|
|
|
|
enc = encoding
|
|
|
|
if config_encoding == 'locale':
|
2003-05-09 21:49:56 -03:00
|
|
|
ask_user = False
|
2003-05-17 23:24:32 -03:00
|
|
|
except UnicodeError:
|
|
|
|
chars = BOM_UTF8 + chars.encode("utf-8")
|
|
|
|
enc = "utf-8"
|
|
|
|
if not ask_user:
|
2003-05-09 21:49:56 -03:00
|
|
|
return chars
|
2003-05-17 23:24:32 -03:00
|
|
|
dialog = EncodingMessage(self.editwin.top, enc)
|
|
|
|
dialog.go()
|
|
|
|
if dialog.num == 1:
|
|
|
|
# User asked us to edit the file
|
|
|
|
encline = "# -*- coding: %s -*-\n" % enc
|
|
|
|
firstline = self.text.get("1.0", "2.0")
|
|
|
|
if firstline.startswith("#!"):
|
|
|
|
# Insert encoding after #! line
|
|
|
|
self.text.insert("2.0", encline)
|
|
|
|
else:
|
|
|
|
self.text.insert("1.0", encline)
|
|
|
|
return self.encode(self.text.get("1.0", "end-1c"))
|
|
|
|
return chars
|
2002-12-31 12:03:23 -04:00
|
|
|
|
2002-09-16 19:03:37 -03:00
|
|
|
def fixlastline(self):
|
|
|
|
c = self.text.get("end-2c")
|
|
|
|
if c != '\n':
|
|
|
|
self.text.insert("end-1c", "\n")
|
|
|
|
|
2002-06-11 01:45:34 -03:00
|
|
|
def print_window(self, event):
|
Merged revisions 58221-58741 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58221 | georg.brandl | 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) | 2 lines
Patch #1181: add os.environ.clear() method.
........
r58225 | sean.reifschneider | 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) | 3 lines
Issue1704287: "make install" fails unless you do "make" first. Make
oldsharedmods and sharedmods in "libinstall".
........
r58232 | guido.van.rossum | 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) | 4 lines
Patch # 188 by Philip Jenvey.
Make tell() mark CRLF as a newline.
With unit test.
........
r58242 | georg.brandl | 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) | 2 lines
Fix typo and double word.
........
r58245 | georg.brandl | 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) | 2 lines
#1196: document default radix for int().
........
r58247 | georg.brandl | 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) | 2 lines
#1177: accept 2xx responses for https too, not only http.
........
r58249 | andrew.kuchling | 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) | 1 line
Remove stray odd character; grammar fix
........
r58250 | andrew.kuchling | 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) | 1 line
Typo fix
........
r58251 | andrew.kuchling | 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) | 1 line
Add various items
........
r58268 | vinay.sajip | 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) | 1 line
Change to flush and close logic to fix #1760556.
........
r58269 | vinay.sajip | 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) | 1 line
Change to basicConfig() to fix #1021.
........
r58270 | georg.brandl | 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) | 2 lines
#1208: document match object's boolean value.
........
r58271 | vinay.sajip | 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) | 1 line
Minor date change.
........
r58272 | vinay.sajip | 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) | 1 line
Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time.
........
r58288 | brett.cannon | 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) | 9 lines
tuple.__repr__ did not consider a reference loop as it is not possible from
Python code; but it is possible from C. object.__str__ had the issue of not
expecting a type to doing something within it's tp_str implementation that
could trigger an infinite recursion, but it could in C code.. Both found
thanks to BaseException and how it handles its repr.
Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at
coming up with a solution.
........
r58289 | brett.cannon | 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) | 3 lines
Fix error introduced by r58288; if a tuple is length 0 return its repr and
don't worry about any self-referring tuples.
........
r58294 | facundo.batista | 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) | 11 lines
Made the various is_* operations return booleans. This was discussed
with Cawlishaw by mail, and he basically confirmed that to these is_*
operations, there's no need to return Decimal(0) and Decimal(1) if
the language supports the False and True booleans.
Also added a few tests for the these functions in extra.decTest, since
they are mostly untested (apart from the doctests).
Thanks Mark Dickinson
........
r58295 | facundo.batista | 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) | 4 lines
Added a class to store the digits of log(10), so that they can be made
available when necessary without recomputing. Thanks Mark Dickinson
........
r58299 | mark.summerfield | 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) | 4 lines
Added note in footnote about string comparisons about
unicodedata.normalize().
........
r58304 | raymond.hettinger | 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) | 1 line
enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy.
........
r58305 | raymond.hettinger | 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) | 1 line
itertools.count() no longer limited to sys.maxint.
........
r58306 | kurt.kaiser | 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) | 3 lines
Assume that the user knows when he wants to end the line; don't insert
something he didn't select or complete.
........
r58307 | kurt.kaiser | 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) | 2 lines
Remove unused theme that was causing a fault in p3k.
........
r58308 | kurt.kaiser | 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) | 2 lines
Clean up EditorWindow close.
........
r58309 | kurt.kaiser | 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) | 7 lines
textView cleanup. Patch 1718043 Tal Einat.
M idlelib/EditorWindow.py
M idlelib/aboutDialog.py
M idlelib/textView.py
M idlelib/NEWS.txt
........
r58310 | kurt.kaiser | 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) | 3 lines
configDialog cleanup. Patch 1730217 Tal Einat.
........
r58311 | neal.norwitz | 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) | 4 lines
Coverity #151: Remove deadcode.
All this code already exists above starting at line 653.
........
r58325 | fred.drake | 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) | 1 line
wrap lines to <80 characters before fixing errors
........
r58326 | raymond.hettinger | 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) | 6 lines
Add __asdict__() to NamedTuple and refine the docs.
Add maxlen support to deque() and fixup docs.
Partially fix __reduce__(). The None as a third arg was no longer supported.
Still needs work on __reduce__() to handle recursive inputs.
........
r58327 | fred.drake | 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) | 3 lines
move descriptions of ac_(in|out)_buffer_size to the right place
http://bugs.python.org/issue1053
........
r58329 | neal.norwitz | 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) | 3 lines
dict could be NULL, so we need to XDECREF.
Fix a compiler warning about passing a PyTypeObject* instead of PyObject*.
........
r58330 | neal.norwitz | 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) | 2 lines
Fix Coverity #158: Check the correct variable.
........
r58332 | neal.norwitz | 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) | 7 lines
Fix Coverity #159.
This code was broken if save() returned a negative number since i contained
a boolean value and then we compared i < 0 which should never be true.
Will backport (assuming it's necessary)
........
r58334 | neal.norwitz | 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) | 1 line
Add a note about fixing some more warnings found by Coverity.
........
r58338 | raymond.hettinger | 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) | 1 line
Restore BEGIN/END THREADS macros which were squashed in the previous checkin
........
r58343 | gregory.p.smith | 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) | 3 lines
Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390
ubuntu buildbots.
........
r58344 | gregory.p.smith | 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) | 2 lines
Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module.
........
r58348 | gregory.p.smith | 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) | 3 lines
Use the host the author likely meant in the first place. pop.gmail.com is
reliable. gmail.org is someones personal domain.
........
r58351 | neal.norwitz | 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) | 3 lines
Ensure that this test will pass even if another test left an unwritable TESTFN.
Also use the safe unlink in test_support instead of rolling our own here.
........
r58368 | georg.brandl | 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) | 3 lines
#1123: fix the docs for the str.split(None, sep) case.
Also expand a few other methods' docs, which had more info in the deprecated string module docs.
........
r58369 | georg.brandl | 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) | 2 lines
Update docstring of sched, also remove an unused assignment.
........
r58370 | raymond.hettinger | 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) | 5 lines
Add comments to NamedTuple code.
Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases).
Improve the error message in the case of a SyntaxError (caused by a duplicate field name).
........
r58371 | raymond.hettinger | 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) | 1 line
Missed a line in the docs
........
r58372 | raymond.hettinger | 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) | 1 line
Better variable names
........
r58376 | georg.brandl | 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) | 3 lines
#1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc.
No need to merge this to py3k!
........
r58380 | raymond.hettinger | 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58381 | andrew.kuchling | 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58382 | raymond.hettinger | 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) | 1 line
Make the error messages more specific
........
r58384 | gregory.p.smith | 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) | 10 lines
Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API
object available as bsddb.db.api. This is based on the patch submitted
by Duncan Grisby here:
http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900
See this thread for additional info:
http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users
It also cleans up the code a little by removing some ifdef/endifs for
python prior to 2.1 and for unsupported Berkeley DB <= 3.2.
........
r58385 | gregory.p.smith | 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) | 5 lines
Fix a double free when positioning a database cursor to a non-existant
string key (and probably a few other situations with string keys).
This was reported with a patch as pybsddb sourceforge bug 1708868 by
jjjhhhlll at gmail.
........
r58386 | gregory.p.smith | 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) | 3 lines
Use the highest cPickle protocol in bsddb.dbshelve. This comes from
sourceforge pybsddb patch 1551443 by w_barnes.
........
r58394 | gregory.p.smith | 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) | 2 lines
remove another sleepycat reference
........
r58396 | kurt.kaiser | 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) | 3 lines
Allow interrupt only when executing user code in subprocess
Patch 1225 Tal Einat modified from IDLE-Spoon.
........
r58399 | brett.cannon | 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) | 5 lines
Remove file-level typedefs that were inconsistently used throughout the file.
Just move over to the public API names.
Closes issue1238.
........
r58401 | raymond.hettinger | 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) | 1 line
Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques.
........
r58403 | kurt.kaiser | 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) | 2 lines
Allow cursor color change w/o restart. Patch 1725576 Tal Einat.
........
r58404 | kurt.kaiser | 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) | 2 lines
show paste if > 80 columns. Patch 1659326 Tal Einat.
........
r58415 | thomas.heller | 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) | 5 lines
On OS X, use os.uname() instead of gestalt.sysv(...) to get the
operating system version. This allows to use ctypes when Python
was configured with --disable-toolbox-glue.
........
r58419 | neal.norwitz | 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warning about not being able to create an existing directory.
........
r58420 | neal.norwitz | 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warnings on a bunch of platforms by using a proper prototype.
........
r58421 | neal.norwitz | 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) | 4 lines
Get rid of compiler warning about retval being used (returned) without
being initialized. (gcc warning and Coverity 202)
........
r58422 | neal.norwitz | 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) | 1 line
Fix Coverity 168: Close the file before returning (exiting).
........
r58423 | neal.norwitz | 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) | 4 lines
Fix Coverity 180: Don't overallocate. We don't need structs, but pointers.
Also fix a memory leak.
........
r58424 | neal.norwitz | 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) | 5 lines
Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory
would be accessed.
Will backport.
........
r58425 | neal.norwitz | 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) | 1 line
Get this module to compile with bsddb versions prior to 4.3
........
r58430 | martin.v.loewis | 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) | 3 lines
Bug #1216: Restore support for Visual Studio 2002.
Will backport to 2.5.
........
r58433 | raymond.hettinger | 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) | 1 line
Fix test of count.__repr__() to ignore the 'L' if the count is a long
........
r58434 | gregory.p.smith | 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) | 4 lines
Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append
was useless due to inverted logic. Also adds a test case for RECNO dbs
to test_dbshelve.
........
r58445 | georg.brandl | 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix email example.
........
r58450 | gregory.p.smith | 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix an uncollectable reference leak in bsddb.db.DBShelf.append
........
r58453 | neal.norwitz | 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) | 8 lines
Let the O/S supply a port if none of the default ports can be used.
This should make the tests more robust at the expense of allowing
tests to be sloppier by not requiring them to cleanup after themselves.
(It will legitamitely help when running two test suites simultaneously
or if another process is already using one of the predefined ports.)
Also simplifies (slightLy) the exception handling elsewhere.
........
r58459 | neal.norwitz | 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) | 2 lines
Don't raise a string exception, they don't work anymore.
........
r58460 | neal.norwitz | 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) | 1 line
Use unittest for assertions
........
r58468 | armin.rigo | 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) | 2 lines
test_bigbits was not testing what it seemed to.
........
r58471 | guido.van.rossum | 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) | 3 lines
Change a PyErr_Print() into a PyErr_Clear(),
per discussion in issue 1031213.
........
r58500 | raymond.hettinger | 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) | 1 line
Improve error messages
........
r58506 | raymond.hettinger | 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) | 1 line
More docs, error messages, and tests
........
r58507 | andrew.kuchling | 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) | 1 line
Add items
........
r58508 | brett.cannon | 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) | 3 lines
Remove ``:const:`` notation on None in parameter list. Since the markup is not
rendered for parameters it just showed up as ``:const:`None` `` in the output.
........
r58509 | brett.cannon | 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) | 3 lines
Re-order some functions whose parameters differ between PyObject and const char
* so that they are next to each other.
........
r58522 | armin.rigo | 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) | 5 lines
Fix the overflow checking of list_repeat.
Introduce overflow checking into list_inplace_repeat.
Backport candidate, possibly.
........
r58530 | facundo.batista | 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) | 7 lines
Issue #1580738. When HTTPConnection reads the whole stream with read(),
it closes itself. When the stream is read in several calls to read(n),
it should behave in the same way if HTTPConnection knows where the end
of the stream is (through self.length). Added a test case for this
behaviour.
........
r58531 | facundo.batista | 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) | 3 lines
Issue 1289, just a typo.
........
r58532 | gregory.p.smith | 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) | 4 lines
cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a
keyword argument whenever possible to avoid bugs and confusion. (dbtables.py
line 447 self.db.get using txn as a non-keyword was an actual bug due to this)
........
r58533 | gregory.p.smith | 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) | 4 lines
Fix a weird bug in dbtables: if it chose a random rowid string that contained
NULL bytes it would cause the database all sorts of problems in the future
leading to very strange random failures and corrupt dbtables.bsdTableDb dbs.
........
r58534 | gregory.p.smith | 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) | 3 lines
A cleaner fix than the one committed last night. Generate random rowids that
do not contain null bytes.
........
r58537 | gregory.p.smith | 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) | 2 lines
mention bsddb fixes.
........
r58538 | raymond.hettinger | 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) | 1 line
Remove useless warning
........
r58539 | gregory.p.smith | 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) | 2 lines
squelch the warning that this test is supposed to trigger.
........
r58542 | georg.brandl | 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) | 2 lines
Clarify wording for apply().
........
r58544 | mark.summerfield | 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) | 3 lines
Added a cross-ref to each other.
........
r58545 | georg.brandl | 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) | 2 lines
#1284: "S" means "seen", not unread.
........
r58548 | thomas.heller | 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) | 4 lines
Fix ctypes on 32-bit systems when Python is configured --with-system-ffi.
See also https://bugs.launchpad.net/bugs/72505.
Ported from release25-maint branch.
........
r58550 | facundo.batista | 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) | 8 lines
The constructor from tuple was way too permissive: it allowed bad
coefficient numbers, floats in the sign, and other details that
generated directly the wrong number in the best case, or triggered
misfunctionality in the alorithms.
Test cases added for these issues. Thanks Mark Dickinson.
........
r58559 | georg.brandl | 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) | 2 lines
Fix code being interpreted as a target.
........
r58561 | georg.brandl | 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new "cmdoption" directive.
........
r58562 | georg.brandl | 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) | 2 lines
Make a path more Unix-standardy.
........
r58564 | georg.brandl | 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new directive "envvar".
........
r58567 | georg.brandl | 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) | 6 lines
* Add new toplevel chapter, "Using Python." (how to install,
configure and setup python on different platforms -- at least
in theory.)
* Move the Python on Mac docs in that chapter.
* Add a new chapter about the command line invocation, by stargaming.
........
r58568 | georg.brandl | 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) | 2 lines
Change title, for now.
........
r58569 | georg.brandl | 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) | 2 lines
Add entry to ACKS.
........
r58570 | georg.brandl | 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) | 2 lines
Clarify -E docs.
........
r58571 | georg.brandl | 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) | 2 lines
Even more clarification.
........
r58572 | andrew.kuchling | 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) | 1 line
Fix protocol name
........
r58573 | andrew.kuchling | 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) | 1 line
Various items
........
r58574 | andrew.kuchling | 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) | 1 line
Use correct header line
........
r58576 | armin.rigo | 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) | 3 lines
Add a crasher for the long-standing issue with closing a file
while another thread uses it.
........
r58577 | georg.brandl | 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) | 2 lines
Remove duplicate crasher.
........
r58578 | georg.brandl | 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "byte code" to "bytecode". Also sprinkle :term: markup for it.
........
r58579 | georg.brandl | 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) | 2 lines
Add markup to new function descriptions.
........
r58580 | georg.brandl | 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for descriptors.
........
r58581 | georg.brandl | 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "file-descriptor" to "file descriptor".
........
r58582 | georg.brandl | 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term: for generators.
........
r58583 | georg.brandl | 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for iterator.
........
r58584 | georg.brandl | 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for "new-style class".
........
r58588 | neal.norwitz | 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) | 1 line
Add Chris Monson so he can edit PEPs.
........
r58594 | guido.van.rossum | 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) | 4 lines
Issue #1307, patch by Derek Shockey.
When "MAIL" is received without args, an exception happens instead of
sending a 501 syntax error response.
........
r58598 | travis.oliphant | 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) | 1 line
Add phuang patch from Issue 708374 which adds offset parameter to mmap module.
........
r58601 | neal.norwitz | 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) | 2 lines
Bug #1313, fix typo (wrong variable name) in example.
........
r58609 | georg.brandl | 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) | 2 lines
Update Pygments version from externals.
........
r58618 | guido.van.rossum | 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) | 3 lines
Issue 1307 by Derek Shockey, fox the same bug for RCPT.
Neal: please backport!
........
r58620 | raymond.hettinger | 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) | 1 line
Shorter name for namedtuple()
........
r58621 | andrew.kuchling | 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) | 1 line
Update name
........
r58622 | raymond.hettinger | 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup news entry
........
r58623 | raymond.hettinger | 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) | 1 line
Optimize sum() for integer and float inputs.
........
r58624 | raymond.hettinger | 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup error return and add support for intermixed ints and floats/
........
r58628 | vinay.sajip | 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) | 1 line
Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__()
........
r58641 | facundo.batista | 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) | 4 lines
Issue 1290. CharacterData.__repr__ was constructing a string
in response that keeped having a non-ascii character.
........
r58643 | thomas.heller | 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) | 1 line
Added unittest for calling a function with paramflags (backport from py3k branch).
........
r58645 | matthias.klose | 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*.
........
r58651 | georg.brandl | 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) | 2 lines
Bug #1287: make os.environ.pop() work as expected.
........
r58652 | raymond.hettinger | 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) | 1 line
Missing DECREFs
........
r58653 | matthias.klose | 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*, pass --with-system-ffi to CONFIG_ARGS
........
r58655 | thomas.heller | 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) | 2 lines
ffi_type_longdouble may be already #defined.
See issue 1324.
........
r58656 | kurt.kaiser | 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) | 3 lines
Correct an ancient bug in an unused path by removing that path: register() is
now idempotent.
........
r58660 | kurt.kaiser | 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) | 4 lines
1. Add comments to provide top-level documentation.
2. Refactor to use more descriptive names.
3. Enhance tests in main().
........
r58675 | georg.brandl | 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) | 2 lines
Fix new pop() method on os.environ on ignorecase-platforms.
........
r58696 | neal.norwitz | 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) | 1 line
Update URL for Pygments. 0.8.1 is no longer available
........
r58697 | hyeshik.chang | 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) | 3 lines
- Add support for FreeBSD 8 which is recently forked from FreeBSD 7.
- Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7.
........
r58698 | hyeshik.chang | 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) | 2 lines
Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet)
........
r58700 | kurt.kaiser | 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) | 2 lines
Add confirmation dialog before printing. Patch 1717170 Tal Einat.
........
r58706 | guido.van.rossum | 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) | 3 lines
Patch 1353 by Jacob Winther.
Add mp4 mapping to mimetypes.py.
........
r58709 | guido.van.rossum | 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) | 6 lines
Backport fixes for the code that decodes octal escapes (and for PyString
also hex escapes) -- this was reaching beyond the end of the input string
buffer, even though it is not supposed to be \0-terminated.
This has no visible effect but is clearly the correct thing to do.
(In 3.0 it had a visible effect after removing ob_sstate from PyString.)
........
r58710 | kurt.kaiser | 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) | 7 lines
check in Tal Einat's update to tabpage.py
Patch 1612746
M configDialog.py
M NEWS.txt
AM tabbedpages.py
........
r58715 | georg.brandl | 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) | 2 lines
Use correct markup.
........
r58716 | georg.brandl | 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) | 2 lines
Make example about hiding None return values at the prompt clearer.
........
r58728 | neal.norwitz | 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) | 1 line
Fix some compiler warnings for signed comparisons on Unix and Windows.
........
r58731 | martin.v.loewis | 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) | 2 lines
Adding Christian Heimes.
........
r58737 | raymond.hettinger | 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) | 1 line
Clarify the reasons why pickle is almost always better than marshal
........
r58739 | raymond.hettinger | 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) | 1 line
Sets are marshalable.
........
2007-11-01 16:42:39 -03:00
|
|
|
m = tkMessageBox.Message(
|
|
|
|
title="Print",
|
|
|
|
message="Print to Default Printer",
|
|
|
|
icon=tkMessageBox.QUESTION,
|
|
|
|
type=tkMessageBox.OKCANCEL,
|
|
|
|
default=tkMessageBox.OK,
|
|
|
|
master=self.text)
|
|
|
|
reply = m.show()
|
|
|
|
if reply != tkMessageBox.OK:
|
|
|
|
self.text.focus_set()
|
|
|
|
return "break"
|
2002-06-11 01:45:34 -03:00
|
|
|
tempfilename = None
|
2003-06-09 00:12:42 -03:00
|
|
|
saved = self.get_saved()
|
|
|
|
if saved:
|
2002-06-11 01:45:34 -03:00
|
|
|
filename = self.filename
|
2003-06-09 00:12:42 -03:00
|
|
|
# shell undo is reset after every prompt, looks saved, probably isn't
|
|
|
|
if not saved or filename is None:
|
2003-06-14 14:56:25 -03:00
|
|
|
(tfd, tempfilename) = tempfile.mkstemp(prefix='IDLE_tmp_')
|
|
|
|
filename = tempfilename
|
|
|
|
os.close(tfd)
|
|
|
|
if not self.writefile(tempfilename):
|
2002-06-11 01:45:34 -03:00
|
|
|
os.unlink(tempfilename)
|
|
|
|
return "break"
|
|
|
|
platform=os.name
|
|
|
|
printPlatform=1
|
|
|
|
if platform == 'posix': #posix platform
|
2002-09-16 19:03:37 -03:00
|
|
|
command = idleConf.GetOption('main','General',
|
|
|
|
'print-command-posix')
|
2002-06-11 01:45:34 -03:00
|
|
|
command = command + " 2>&1"
|
|
|
|
elif platform == 'nt': #win32 platform
|
|
|
|
command = idleConf.GetOption('main','General','print-command-win')
|
|
|
|
else: #no printing for this platform
|
|
|
|
printPlatform=0
|
|
|
|
if printPlatform: #we can try to print for this platform
|
|
|
|
command = command % filename
|
|
|
|
pipe = os.popen(command, "r")
|
2003-06-09 00:12:42 -03:00
|
|
|
# things can get ugly on NT if there is no printer available.
|
2002-06-11 01:45:34 -03:00
|
|
|
output = pipe.read().strip()
|
|
|
|
status = pipe.close()
|
|
|
|
if status:
|
2002-09-16 19:03:37 -03:00
|
|
|
output = "Printing failed (exit status 0x%x)\n" % \
|
|
|
|
status + output
|
2002-06-11 01:45:34 -03:00
|
|
|
if output:
|
|
|
|
output = "Printing command: %s\n" % repr(command) + output
|
|
|
|
tkMessageBox.showerror("Print status", output, master=self.text)
|
|
|
|
else: #no printing for this platform
|
2002-12-31 12:03:23 -04:00
|
|
|
message="Printing is not enabled for this platform: %s" % platform
|
2002-06-11 01:45:34 -03:00
|
|
|
tkMessageBox.showinfo("Print status", message, master=self.text)
|
2003-06-14 14:56:25 -03:00
|
|
|
if tempfilename:
|
|
|
|
os.unlink(tempfilename)
|
2002-06-11 01:45:34 -03:00
|
|
|
return "break"
|
2002-12-31 12:03:23 -04:00
|
|
|
|
2000-08-14 22:13:23 -03:00
|
|
|
opendialog = None
|
|
|
|
savedialog = None
|
|
|
|
|
|
|
|
filetypes = [
|
|
|
|
("Python and text files", "*.py *.pyw *.txt", "TEXT"),
|
|
|
|
("All text files", "*", "TEXT"),
|
|
|
|
("All files", "*"),
|
|
|
|
]
|
|
|
|
|
|
|
|
def askopenfile(self):
|
|
|
|
dir, base = self.defaultfilename("open")
|
|
|
|
if not self.opendialog:
|
|
|
|
self.opendialog = tkFileDialog.Open(master=self.text,
|
|
|
|
filetypes=self.filetypes)
|
2005-11-27 12:59:04 -04:00
|
|
|
filename = self.opendialog.show(initialdir=dir, initialfile=base)
|
|
|
|
return filename
|
2000-08-14 22:13:23 -03:00
|
|
|
|
|
|
|
def defaultfilename(self, mode="open"):
|
|
|
|
if self.filename:
|
|
|
|
return os.path.split(self.filename)
|
2003-06-04 23:34:04 -03:00
|
|
|
elif self.dirname:
|
|
|
|
return self.dirname, ""
|
2000-08-14 22:13:23 -03:00
|
|
|
else:
|
|
|
|
try:
|
|
|
|
pwd = os.getcwd()
|
|
|
|
except os.error:
|
|
|
|
pwd = ""
|
|
|
|
return pwd, ""
|
|
|
|
|
|
|
|
def asksavefile(self):
|
|
|
|
dir, base = self.defaultfilename("save")
|
|
|
|
if not self.savedialog:
|
|
|
|
self.savedialog = tkFileDialog.SaveAs(master=self.text,
|
|
|
|
filetypes=self.filetypes)
|
2005-11-27 12:59:04 -04:00
|
|
|
filename = self.savedialog.show(initialdir=dir, initialfile=base)
|
|
|
|
return filename
|
2000-08-14 22:13:23 -03:00
|
|
|
|
2002-11-03 23:11:10 -04:00
|
|
|
def updaterecentfileslist(self,filename):
|
2002-12-14 00:38:51 -04:00
|
|
|
"Update recent file list on all editor windows"
|
2007-08-22 15:06:14 -03:00
|
|
|
if self.editwin.flist:
|
|
|
|
self.editwin.update_recent_files_list(filename)
|
2002-11-03 23:11:10 -04:00
|
|
|
|
2000-08-14 22:13:23 -03:00
|
|
|
def test():
|
|
|
|
root = Tk()
|
|
|
|
class MyEditWin:
|
|
|
|
def __init__(self, text):
|
|
|
|
self.text = text
|
|
|
|
self.flist = None
|
|
|
|
self.text.bind("<Control-o>", self.open)
|
|
|
|
self.text.bind("<Control-s>", self.save)
|
|
|
|
self.text.bind("<Alt-s>", self.save_as)
|
|
|
|
self.text.bind("<Alt-z>", self.save_a_copy)
|
|
|
|
def get_saved(self): return 0
|
|
|
|
def set_saved(self, flag): pass
|
|
|
|
def reset_undo(self): pass
|
|
|
|
def open(self, event):
|
|
|
|
self.text.event_generate("<<open-window-from-file>>")
|
|
|
|
def save(self, event):
|
|
|
|
self.text.event_generate("<<save-window>>")
|
|
|
|
def save_as(self, event):
|
|
|
|
self.text.event_generate("<<save-window-as-file>>")
|
|
|
|
def save_a_copy(self, event):
|
|
|
|
self.text.event_generate("<<save-copy-of-window-as-file>>")
|
|
|
|
text = Text(root)
|
|
|
|
text.pack()
|
|
|
|
text.focus_set()
|
|
|
|
editwin = MyEditWin(text)
|
|
|
|
io = IOBinding(editwin)
|
|
|
|
root.mainloop()
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
test()
|