mirror of
https://github.com/python/cpython.git
synced 2025-07-13 22:35:18 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ................ r62425 | andrew.kuchling | 2008-04-21 03:45:57 +0200 (Mon, 21 Apr 2008) | 1 line Comment typo ................ r62426 | mark.dickinson | 2008-04-21 03:55:50 +0200 (Mon, 21 Apr 2008) | 2 lines Silence 'r may be used uninitialized' compiler warning. ................ r62427 | andrew.kuchling | 2008-04-21 04:08:00 +0200 (Mon, 21 Apr 2008) | 1 line Markup fix ................ r62428 | andrew.kuchling | 2008-04-21 04:08:13 +0200 (Mon, 21 Apr 2008) | 1 line Wording changes ................ r62429 | andrew.kuchling | 2008-04-21 04:14:24 +0200 (Mon, 21 Apr 2008) | 1 line Add various items ................ r62434 | thomas.heller | 2008-04-21 15:46:55 +0200 (Mon, 21 Apr 2008) | 1 line Fix typo. ................ r62435 | david.goodger | 2008-04-21 16:40:22 +0200 (Mon, 21 Apr 2008) | 1 line corrections ("reStructuredText" is one word) ................ r62436 | david.goodger | 2008-04-21 16:43:33 +0200 (Mon, 21 Apr 2008) | 1 line capitalization ................ r62441 | gregory.p.smith | 2008-04-21 19:46:40 +0200 (Mon, 21 Apr 2008) | 2 lines explicitly flush after the ... since there wasn't a newline ................ r62444 | jeroen.ruigrok | 2008-04-21 22:15:39 +0200 (Mon, 21 Apr 2008) | 2 lines Windows x64 also falls under VER_PLATFORM_WIN32_NT. ................ r62446 | gregory.p.smith | 2008-04-21 23:31:08 +0200 (Mon, 21 Apr 2008) | 3 lines If sys.stdin is not a tty, fall back to default_getpass after printing a warning instead of failing with a termios.error. ................ r62447 | mark.dickinson | 2008-04-22 00:32:24 +0200 (Tue, 22 Apr 2008) | 8 lines test_math and test_cmath are failing on the FreeBSD 6.2 trunk buildbot, apparently because tanh(-0.) loses the sign of zero on that platform. If true, this is a bug in FreeBSD. Added a configure test to verify this. I still need to figure out how best to deal with this failure. ................ r62448 | amaury.forgeotdarc | 2008-04-22 00:35:30 +0200 (Tue, 22 Apr 2008) | 7 lines Issue 2665: On Windows, sys.stderr does not contain a valid file when running without a console. It seems to work, but will fail at the first flush. This causes IDLE to crash when too many warnings are printed. Will backport. ................ r62450 | benjamin.peterson | 2008-04-22 00:57:00 +0200 (Tue, 22 Apr 2008) | 2 lines Fix Sphinx warnings ................ r62451 | mark.dickinson | 2008-04-22 02:54:27 +0200 (Tue, 22 Apr 2008) | 3 lines Make configure test for tanh(-0.) == -0. committed in r62447 actually work. (The test wasn't properly linked with libm. Sigh.) ................ r62452 | benjamin.peterson | 2008-04-22 04:16:03 +0200 (Tue, 22 Apr 2008) | 2 lines Various io doc updates ................ r62453 | neal.norwitz | 2008-04-22 07:07:47 +0200 (Tue, 22 Apr 2008) | 1 line Add Thomas Lee ................ r62454 | gregory.p.smith | 2008-04-22 10:08:41 +0200 (Tue, 22 Apr 2008) | 8 lines Major improvements: * Default to using /dev/tty for the password prompt and input before falling back to sys.stdin and sys.stderr. * Use sys.stderr instead of sys.stdout. * print the 'password may be echoed' warning to stream used to display the prompt rather than always sys.stderr. * warn() with GetPassWarning when input may be echoed. ................ r62455 | gregory.p.smith | 2008-04-22 10:11:33 +0200 (Tue, 22 Apr 2008) | 2 lines update the getpass entry ................ r62463 | amaury.forgeotdarc | 2008-04-22 23:14:41 +0200 (Tue, 22 Apr 2008) | 5 lines Issue #2670: urllib2.build_opener() failed when two handlers derive the same default base class. Will backport. ................ r62465 | skip.montanaro | 2008-04-23 00:45:09 +0200 (Wed, 23 Apr 2008) | 3 lines Factor in documentation changes from issue 1753732. ................ r62466 | gregory.p.smith | 2008-04-23 03:06:42 +0200 (Wed, 23 Apr 2008) | 2 lines syntax fixup ................ r62469 | benjamin.peterson | 2008-04-23 22:38:06 +0200 (Wed, 23 Apr 2008) | 2 lines #2673 Fix example typo in optparse docs ................ r62474 | martin.v.loewis | 2008-04-24 11:50:50 +0200 (Thu, 24 Apr 2008) | 2 lines Add Guilherme Polo. ................ r62476 | martin.v.loewis | 2008-04-24 15:16:36 +0200 (Thu, 24 Apr 2008) | 3 lines Remove Py_Refcnt, Py_Type, Py_Size, as they were added only for backwards compatibility, yet 2.5 did not have them at all. ................ r62477 | martin.v.loewis | 2008-04-24 15:17:24 +0200 (Thu, 24 Apr 2008) | 2 lines Fix typo. ................ r62478 | martin.v.loewis | 2008-04-24 15:18:03 +0200 (Thu, 24 Apr 2008) | 2 lines Add Jesus Cea. ................ r62480 | amaury.forgeotdarc | 2008-04-24 20:07:05 +0200 (Thu, 24 Apr 2008) | 4 lines Issue2681: the literal 0o8 was wrongly accepted, and evaluated as float(0.0). This happened only when 8 is the first digit. Credits go to Lukas Meuser. ................ r62485 | amaury.forgeotdarc | 2008-04-24 22:10:26 +0200 (Thu, 24 Apr 2008) | 5 lines Disable gc when running test_trace, or we may record the __del__ of collected objects. See http://mail.python.org/pipermail/python-checkins/2008-April/068633.html the extra events perfectly match several calls to socket._fileobject.__del__() ................ r62492 | neal.norwitz | 2008-04-25 05:40:17 +0200 (Fri, 25 Apr 2008) | 1 line Fix typo (now -> no) ................ r62497 | armin.rigo | 2008-04-25 11:35:18 +0200 (Fri, 25 Apr 2008) | 2 lines A new crasher. ................ r62498 | thomas.heller | 2008-04-25 17:44:16 +0200 (Fri, 25 Apr 2008) | 1 line Add from_buffer and from_buffer_copy class methods to ctypes types. ................ r62500 | mark.dickinson | 2008-04-25 18:59:09 +0200 (Fri, 25 Apr 2008) | 3 lines Issue 2635: fix bug in the fix_sentence_endings option to textwrap.fill. ................ r62507 | benjamin.peterson | 2008-04-25 23:43:56 +0200 (Fri, 25 Apr 2008) | 2 lines Allow test_import to work when it is invoked directly ................ r62513 | georg.brandl | 2008-04-26 20:31:07 +0200 (Sat, 26 Apr 2008) | 2 lines #2691: document PyLong (s)size_t APIs, patch by Alexander Belopolsky. ................ r62514 | georg.brandl | 2008-04-26 20:32:17 +0200 (Sat, 26 Apr 2008) | 2 lines Add missing return type to dealloc. ................ r62516 | alexandre.vassalotti | 2008-04-27 02:52:24 +0200 (Sun, 27 Apr 2008) | 2 lines Fixed URL of PEP 205 in weakref's module docstring. ................ r62521 | georg.brandl | 2008-04-27 11:39:59 +0200 (Sun, 27 Apr 2008) | 2 lines #2677: add note that not all functions may accept keyword args. ................ r62531 | georg.brandl | 2008-04-27 19:38:55 +0200 (Sun, 27 Apr 2008) | 2 lines Use correct XHTML tags. ................ r62535 | benjamin.peterson | 2008-04-27 20:14:39 +0200 (Sun, 27 Apr 2008) | 2 lines #2700 Document PyNumber_ToBase ................ r62545 | skip.montanaro | 2008-04-27 22:53:57 +0200 (Sun, 27 Apr 2008) | 1 line minor wording changes, rewrap a few lines ................ r62546 | kurt.kaiser | 2008-04-27 23:07:41 +0200 (Sun, 27 Apr 2008) | 7 lines Home / Control-A toggles between left margin and end of leading white space. Patch 1196903 Jeff Shute. M idlelib/PyShell.py M idlelib/EditorWindow.py M idlelib/NEWS.txt ................ r62548 | kurt.kaiser | 2008-04-27 23:38:05 +0200 (Sun, 27 Apr 2008) | 2 lines Improved AutoCompleteWindow logic. Patch 2062 Tal Einat. ................ r62549 | kurt.kaiser | 2008-04-27 23:52:19 +0200 (Sun, 27 Apr 2008) | 4 lines Autocompletion of filenames now support alternate separators, e.g. the '/' char on Windows. Patch 2061 Tal Einat. ................ r62550 | skip.montanaro | 2008-04-28 00:49:56 +0200 (Mon, 28 Apr 2008) | 6 lines A few small changes: * The only exception we should catch when trying to import cStringIO is an ImportError. * Delete the function signatures embedded in the mk*temp docstrings. * The tempdir global variable was initialized twice. ................ r62551 | skip.montanaro | 2008-04-28 00:52:02 +0200 (Mon, 28 Apr 2008) | 4 lines Wrap some long paragraphs and include the default values for optional function parameters. ................ r62553 | skip.montanaro | 2008-04-28 04:57:23 +0200 (Mon, 28 Apr 2008) | 7 lines Minor cleanups: * Avoid creating unused local variables where we can. Where we can't prefix the unused variables with '_'. * Avoid shadowing builtins where it won't change the external interface of a function. * Use None as default path arg to readmodule and readmodule_ex. ................ r62554 | skip.montanaro | 2008-04-28 04:59:45 +0200 (Mon, 28 Apr 2008) | 6 lines Correct documentation to match implementation: "Class" instead of "class_descriptor", "Function" instead of "function_descriptor". Note default path value for readmodule*. Wrap some long paragraphs. Don't mention 'inpackage' which isn't part of the public API. ................ r62555 | brett.cannon | 2008-04-28 05:23:50 +0200 (Mon, 28 Apr 2008) | 5 lines Fix a bug introduced by the warnings rewrite where tracebacks were being improperly indented. Closes issue #2699. ................ r62556 | skip.montanaro | 2008-04-28 05:25:37 +0200 (Mon, 28 Apr 2008) | 2 lines Wrap some long lines. ................ r62557 | skip.montanaro | 2008-04-28 05:27:53 +0200 (Mon, 28 Apr 2008) | 6 lines Get rid of _test(), _main(), _debug() and _check(). Tests are no longer needed (better set available in Lib/test/test_robotparser.py). Clean up a few PEP 8 nits (compound statements on a single line, whitespace around operators). ................ r62558 | brett.cannon | 2008-04-28 06:50:06 +0200 (Mon, 28 Apr 2008) | 3 lines Rename the test_traceback_print() function to traceback_print() to prevent test_capi from automatically calling the function. ................ r62559 | georg.brandl | 2008-04-28 07:16:30 +0200 (Mon, 28 Apr 2008) | 2 lines Fix markup. ................ r62569 | amaury.forgeotdarc | 2008-04-28 23:07:06 +0200 (Mon, 28 Apr 2008) | 5 lines test_sundry performs minimal tests (a simple import...) on modules that are not tested otherwise. Some of them now have tests and can be removed. Only 70 to go... ................ r62574 | andrew.kuchling | 2008-04-29 04:03:54 +0200 (Tue, 29 Apr 2008) | 1 line Strip down SSL docs; I'm not managing to get test programs working, so I'll just give a minimal description ................ r62577 | martin.v.loewis | 2008-04-29 08:10:53 +0200 (Tue, 29 Apr 2008) | 2 lines Add Rodrigo and Heiko. ................ r62593 | nick.coghlan | 2008-04-30 16:23:36 +0200 (Wed, 30 Apr 2008) | 1 line Update command line usage documentation to reflect 2.6 changes (also includes some minor cleanups). Addresses TODO list issue 2258 ................ r62595 | andrew.kuchling | 2008-04-30 18:19:55 +0200 (Wed, 30 Apr 2008) | 1 line Typo fix ................ r62604 | benjamin.peterson | 2008-04-30 23:03:58 +0200 (Wed, 30 Apr 2008) | 2 lines make test_support's captured_output a bit more robust when exceptions happen ................ r62605 | georg.brandl | 2008-04-30 23:08:42 +0200 (Wed, 30 Apr 2008) | 2 lines #1748: use functools.wraps instead of rolling own metadata update. ................ r62606 | benjamin.peterson | 2008-04-30 23:25:55 +0200 (Wed, 30 Apr 2008) | 2 lines Remove some from __future__ import with_statements ................ r62608 | benjamin.peterson | 2008-05-01 00:03:36 +0200 (Thu, 01 May 2008) | 2 lines Fix typo in whatsnew ................ r62616 | georg.brandl | 2008-05-01 20:24:32 +0200 (Thu, 01 May 2008) | 2 lines Fix synopsis. ................ r62626 | brett.cannon | 2008-05-02 04:25:09 +0200 (Fri, 02 May 2008) | 6 lines Fix a backwards-compatibility mistake where a new optional argument for warnings.showwarning() was being used. This broke pre-existing replacements for the function since they didn't support the extra argument. Closes issue 2705. ................ r62627 | gregory.p.smith | 2008-05-02 09:26:52 +0200 (Fri, 02 May 2008) | 20 lines This should fix issue2632. A long description of the two competing problems is in the bug report (one old, one recently introduced trying to fix the old one). In short: buffer data during socket._fileobject.read() and readlines() within a cStringIO object instead of a [] of str()s returned from the recv() call. This prevents excessive memory use due to the size parameter being passed to recv() being grossly larger than the actual size of the data returned *and* prevents excessive cpu usage due to looping in python calling recv() with a very tiny size value if min() is used as the previous memory-use bug "fix" did. It also documents what the socket._fileobject._rbufsize member is actually used for. This is a candidate for back porting to 2.5. ................ r62636 | mark.hammond | 2008-05-02 14:48:15 +0200 (Fri, 02 May 2008) | 2 lines #2581: Vista UAC/elevation support for bdist_wininst ................ r62638 | facundo.batista | 2008-05-02 19:39:00 +0200 (Fri, 02 May 2008) | 3 lines Fixed some test structures. Thanks Mark Dickinson. ................ r62644 | ronald.oussoren | 2008-05-02 21:45:11 +0200 (Fri, 02 May 2008) | 7 lines Fix for issue #2573: Can't change the framework name on OS X builds This introduces a new configure option: --with-framework-name=NAME (defaulting to 'Python'). This allows you to install several copies of the Python framework with different names (such as a normal build and a debug build). ................ r62645 | ronald.oussoren | 2008-05-02 21:58:56 +0200 (Fri, 02 May 2008) | 2 lines Finish fix for issue2573, previous patch was incomplete. ................ r62647 | martin.v.loewis | 2008-05-02 23:30:20 +0200 (Fri, 02 May 2008) | 13 lines Merged revisions 62263-62646 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r62470 | david.wolever | 2008-04-24 02:11:07 +0200 (Do, 24 Apr 2008) | 3 lines Fixed up and applied the patch for #2431 -- speeding up 2to3 with a lookup table. ........ r62646 | martin.v.loewis | 2008-05-02 23:29:27 +0200 (Fr, 02 Mai 2008) | 2 lines Fix whitespace. ........ ................ r62648 | ronald.oussoren | 2008-05-02 23:42:35 +0200 (Fri, 02 May 2008) | 4 lines Fix for #1905: PythonLauncher not working correctly on OSX 10.5/Leopard This fixes both Python Launchar and the terminalcommand module. ................ r62651 | ronald.oussoren | 2008-05-02 23:54:56 +0200 (Fri, 02 May 2008) | 2 lines Fix for issue #2520 (cannot import macerrors) ................ r62652 | benjamin.peterson | 2008-05-03 00:12:58 +0200 (Sat, 03 May 2008) | 2 lines capitalization nit for reStructuredText ................ r62653 | brett.cannon | 2008-05-03 03:02:41 +0200 (Sat, 03 May 2008) | 2 lines Fix some indentation errors. ................ r62656 | brett.cannon | 2008-05-03 05:19:39 +0200 (Sat, 03 May 2008) | 6 lines Fix the C implementation of 'warnings' to infer the filename of the module that raised an exception properly when __file__ is not set, __name__ == '__main__', and sys.argv[0] is a false value. Closes issue2743. ................ r62661 | amaury.forgeotdarc | 2008-05-03 14:21:13 +0200 (Sat, 03 May 2008) | 8 lines In test_io, StatefulIncrementalDecoderTest was not part of the test suite. And of course, the test failed: a bytearray was used without reason in io.TextIOWrapper.tell(). The difference is that iterating over bytes (i.e. str in python2.6) returns 1-char bytes, whereas bytearrays yield integers. This code should still work with python3.0 ................ r62663 | benjamin.peterson | 2008-05-03 17:56:42 +0200 (Sat, 03 May 2008) | 2 lines The compiling struct is now passed around to all AST helpers (see issue 2720) ................ r62680 | benjamin.peterson | 2008-05-03 23:35:18 +0200 (Sat, 03 May 2008) | 2 lines Moved testing of builtin types out of test_builtin and into type specific modules ................ r62686 | mark.dickinson | 2008-05-04 04:25:46 +0200 (Sun, 04 May 2008) | 4 lines Make sure that Context traps and flags dictionaries have values 0 and 1 (as documented) rather than True and False. ................ r62687 | benjamin.peterson | 2008-05-04 05:05:49 +0200 (Sun, 04 May 2008) | 2 lines Fix typo in whatsnew ................ r62696 | georg.brandl | 2008-05-04 11:15:04 +0200 (Sun, 04 May 2008) | 2 lines #2752: wrong meaning of '' for socket host. ................ r62699 | christian.heimes | 2008-05-04 13:50:53 +0200 (Sun, 04 May 2008) | 1 line Added note that Python requires at least Win2k SP4 ................ r62700 | gerhard.haering | 2008-05-04 14:59:57 +0200 (Sun, 04 May 2008) | 3 lines SQLite requires 64-bit integers in order to build. So the whole HAVE_LONG_LONG #ifdefing was useless. ................ r62701 | gerhard.haering | 2008-05-04 15:15:12 +0200 (Sun, 04 May 2008) | 3 lines Applied sqliterow-richcmp.diff patch from Thomas Heller in Issue2152. The sqlite3.Row type is now correctly hashable. ................ r62702 | gerhard.haering | 2008-05-04 15:42:44 +0200 (Sun, 04 May 2008) | 5 lines Implemented feature request 2157: Converter names are cut off at '(' characters. This avoids the common case of something like 'NUMBER(10)' not being parsed as 'NUMBER', like expected. Also corrected the docs about converter names being case-sensitive. They aren't any longer. ................ r62703 | georg.brandl | 2008-05-04 17:45:05 +0200 (Sun, 04 May 2008) | 2 lines #2757: Remove spare newline. ................ r62711 | benjamin.peterson | 2008-05-04 21:10:02 +0200 (Sun, 04 May 2008) | 2 lines Fix typo in bugs.rst ................
704 lines
28 KiB
Python
704 lines
28 KiB
Python
"""Provides access to stored IDLE configuration information.
|
|
|
|
Refer to the comments at the beginning of config-main.def for a description of
|
|
the available configuration files and the design implemented to update user
|
|
configuration information. In particular, user configuration choices which
|
|
duplicate the defaults will be removed from the user's configuration files,
|
|
and if a file becomes empty, it will be deleted.
|
|
|
|
The contents of the user files may be altered using the Options/Configure IDLE
|
|
menu to access the configuration GUI (configDialog.py), or manually.
|
|
|
|
Throughout this module there is an emphasis on returning useable defaults
|
|
when a problem occurs in returning a requested configuration value back to
|
|
idle. This is to allow IDLE to continue to function in spite of errors in
|
|
the retrieval of config information. When a default is returned instead of
|
|
a requested config value, a message is printed to stderr to aid in
|
|
configuration problem notification and resolution.
|
|
|
|
"""
|
|
import os
|
|
import sys
|
|
|
|
from idlelib import macosxSupport
|
|
from ConfigParser import ConfigParser, NoOptionError, NoSectionError
|
|
|
|
class InvalidConfigType(Exception): pass
|
|
class InvalidConfigSet(Exception): pass
|
|
class InvalidFgBg(Exception): pass
|
|
class InvalidTheme(Exception): pass
|
|
|
|
class IdleConfParser(ConfigParser):
|
|
"""
|
|
A ConfigParser specialised for idle configuration file handling
|
|
"""
|
|
def __init__(self, cfgFile, cfgDefaults=None):
|
|
"""
|
|
cfgFile - string, fully specified configuration file name
|
|
"""
|
|
self.file=cfgFile
|
|
ConfigParser.__init__(self,defaults=cfgDefaults)
|
|
|
|
def Get(self, section, option, type=None, default=None, raw=False):
|
|
"""
|
|
Get an option value for given section/option or return default.
|
|
If type is specified, return as type.
|
|
"""
|
|
if not self.has_option(section, option):
|
|
return default
|
|
if type=='bool':
|
|
return self.getboolean(section, option)
|
|
elif type=='int':
|
|
return self.getint(section, option)
|
|
else:
|
|
return self.get(section, option, raw=raw)
|
|
|
|
def GetOptionList(self,section):
|
|
"""
|
|
Get an option list for given section
|
|
"""
|
|
if self.has_section(section):
|
|
return self.options(section)
|
|
else: #return a default value
|
|
return []
|
|
|
|
def Load(self):
|
|
"""
|
|
Load the configuration file from disk
|
|
"""
|
|
self.read(self.file)
|
|
|
|
class IdleUserConfParser(IdleConfParser):
|
|
"""
|
|
IdleConfigParser specialised for user configuration handling.
|
|
"""
|
|
|
|
def AddSection(self,section):
|
|
"""
|
|
if section doesn't exist, add it
|
|
"""
|
|
if not self.has_section(section):
|
|
self.add_section(section)
|
|
|
|
def RemoveEmptySections(self):
|
|
"""
|
|
remove any sections that have no options
|
|
"""
|
|
for section in self.sections():
|
|
if not self.GetOptionList(section):
|
|
self.remove_section(section)
|
|
|
|
def IsEmpty(self):
|
|
"""
|
|
Remove empty sections and then return 1 if parser has no sections
|
|
left, else return 0.
|
|
"""
|
|
self.RemoveEmptySections()
|
|
if self.sections():
|
|
return 0
|
|
else:
|
|
return 1
|
|
|
|
def RemoveOption(self,section,option):
|
|
"""
|
|
If section/option exists, remove it.
|
|
Returns 1 if option was removed, 0 otherwise.
|
|
"""
|
|
if self.has_section(section):
|
|
return self.remove_option(section,option)
|
|
|
|
def SetOption(self,section,option,value):
|
|
"""
|
|
Sets option to value, adding section if required.
|
|
Returns 1 if option was added or changed, otherwise 0.
|
|
"""
|
|
if self.has_option(section,option):
|
|
if self.get(section,option)==value:
|
|
return 0
|
|
else:
|
|
self.set(section,option,value)
|
|
return 1
|
|
else:
|
|
if not self.has_section(section):
|
|
self.add_section(section)
|
|
self.set(section,option,value)
|
|
return 1
|
|
|
|
def RemoveFile(self):
|
|
"""
|
|
Removes the user config file from disk if it exists.
|
|
"""
|
|
if os.path.exists(self.file):
|
|
os.remove(self.file)
|
|
|
|
def Save(self):
|
|
"""Update user configuration file.
|
|
|
|
Remove empty sections. If resulting config isn't empty, write the file
|
|
to disk. If config is empty, remove the file from disk if it exists.
|
|
|
|
"""
|
|
if not self.IsEmpty():
|
|
fname = self.file
|
|
try:
|
|
cfgFile = open(fname, 'w')
|
|
except IOError:
|
|
os.unlink(fname)
|
|
cfgFile = open(fname, 'w')
|
|
self.write(cfgFile)
|
|
else:
|
|
self.RemoveFile()
|
|
|
|
class IdleConf:
|
|
"""
|
|
holds config parsers for all idle config files:
|
|
default config files
|
|
(idle install dir)/config-main.def
|
|
(idle install dir)/config-extensions.def
|
|
(idle install dir)/config-highlight.def
|
|
(idle install dir)/config-keys.def
|
|
user config files
|
|
(user home dir)/.idlerc/config-main.cfg
|
|
(user home dir)/.idlerc/config-extensions.cfg
|
|
(user home dir)/.idlerc/config-highlight.cfg
|
|
(user home dir)/.idlerc/config-keys.cfg
|
|
"""
|
|
def __init__(self):
|
|
self.defaultCfg={}
|
|
self.userCfg={}
|
|
self.cfg={}
|
|
self.CreateConfigHandlers()
|
|
self.LoadCfgFiles()
|
|
#self.LoadCfg()
|
|
|
|
def CreateConfigHandlers(self):
|
|
"""
|
|
set up a dictionary of config parsers for default and user
|
|
configurations respectively
|
|
"""
|
|
#build idle install path
|
|
if __name__ != '__main__': # we were imported
|
|
idleDir=os.path.dirname(__file__)
|
|
else: # we were exec'ed (for testing only)
|
|
idleDir=os.path.abspath(sys.path[0])
|
|
userDir=self.GetUserCfgDir()
|
|
configTypes=('main','extensions','highlight','keys')
|
|
defCfgFiles={}
|
|
usrCfgFiles={}
|
|
for cfgType in configTypes: #build config file names
|
|
defCfgFiles[cfgType]=os.path.join(idleDir,'config-'+cfgType+'.def')
|
|
usrCfgFiles[cfgType]=os.path.join(userDir,'config-'+cfgType+'.cfg')
|
|
for cfgType in configTypes: #create config parsers
|
|
self.defaultCfg[cfgType]=IdleConfParser(defCfgFiles[cfgType])
|
|
self.userCfg[cfgType]=IdleUserConfParser(usrCfgFiles[cfgType])
|
|
|
|
def GetUserCfgDir(self):
|
|
"""
|
|
Creates (if required) and returns a filesystem directory for storing
|
|
user config files.
|
|
|
|
"""
|
|
cfgDir = '.idlerc'
|
|
userDir = os.path.expanduser('~')
|
|
if userDir != '~': # expanduser() found user home dir
|
|
if not os.path.exists(userDir):
|
|
warn = ('\n Warning: os.path.expanduser("~") points to\n '+
|
|
userDir+',\n but the path does not exist.\n')
|
|
try:
|
|
sys.stderr.write(warn)
|
|
except IOError:
|
|
pass
|
|
userDir = '~'
|
|
if userDir == "~": # still no path to home!
|
|
# traditionally IDLE has defaulted to os.getcwd(), is this adequate?
|
|
userDir = os.getcwd()
|
|
userDir = os.path.join(userDir, cfgDir)
|
|
if not os.path.exists(userDir):
|
|
try:
|
|
os.mkdir(userDir)
|
|
except (OSError, IOError):
|
|
warn = ('\n Warning: unable to create user config directory\n'+
|
|
userDir+'\n Check path and permissions.\n Exiting!\n\n')
|
|
sys.stderr.write(warn)
|
|
raise SystemExit
|
|
return userDir
|
|
|
|
def GetOption(self, configType, section, option, default=None, type=None,
|
|
warn_on_default=True, raw=False):
|
|
"""
|
|
Get an option value for given config type and given general
|
|
configuration section/option or return a default. If type is specified,
|
|
return as type. Firstly the user configuration is checked, with a
|
|
fallback to the default configuration, and a final 'catch all'
|
|
fallback to a useable passed-in default if the option isn't present in
|
|
either the user or the default configuration.
|
|
configType must be one of ('main','extensions','highlight','keys')
|
|
If a default is returned, and warn_on_default is True, a warning is
|
|
printed to stderr.
|
|
|
|
"""
|
|
if self.userCfg[configType].has_option(section,option):
|
|
return self.userCfg[configType].Get(section, option,
|
|
type=type, raw=raw)
|
|
elif self.defaultCfg[configType].has_option(section,option):
|
|
return self.defaultCfg[configType].Get(section, option,
|
|
type=type, raw=raw)
|
|
else: #returning default, print warning
|
|
if warn_on_default:
|
|
warning = ('\n Warning: configHandler.py - IdleConf.GetOption -\n'
|
|
' problem retrieving configration option %r\n'
|
|
' from section %r.\n'
|
|
' returning default value: %r\n' %
|
|
(option, section, default))
|
|
try:
|
|
sys.stderr.write(warning)
|
|
except IOError:
|
|
pass
|
|
return default
|
|
|
|
def SetOption(self, configType, section, option, value):
|
|
"""In user's config file, set section's option to value.
|
|
|
|
"""
|
|
self.userCfg[configType].SetOption(section, option, value)
|
|
|
|
def GetSectionList(self, configSet, configType):
|
|
"""
|
|
Get a list of sections from either the user or default config for
|
|
the given config type.
|
|
configSet must be either 'user' or 'default'
|
|
configType must be one of ('main','extensions','highlight','keys')
|
|
"""
|
|
if not (configType in ('main','extensions','highlight','keys')):
|
|
raise InvalidConfigType('Invalid configType specified')
|
|
if configSet == 'user':
|
|
cfgParser=self.userCfg[configType]
|
|
elif configSet == 'default':
|
|
cfgParser=self.defaultCfg[configType]
|
|
else:
|
|
raise InvalidConfigSet('Invalid configSet specified')
|
|
return cfgParser.sections()
|
|
|
|
def GetHighlight(self, theme, element, fgBg=None):
|
|
"""
|
|
return individual highlighting theme elements.
|
|
fgBg - string ('fg'or'bg') or None, if None return a dictionary
|
|
containing fg and bg colours (appropriate for passing to Tkinter in,
|
|
e.g., a tag_config call), otherwise fg or bg colour only as specified.
|
|
"""
|
|
if self.defaultCfg['highlight'].has_section(theme):
|
|
themeDict=self.GetThemeDict('default',theme)
|
|
else:
|
|
themeDict=self.GetThemeDict('user',theme)
|
|
fore=themeDict[element+'-foreground']
|
|
if element=='cursor': #there is no config value for cursor bg
|
|
back=themeDict['normal-background']
|
|
else:
|
|
back=themeDict[element+'-background']
|
|
highlight={"foreground": fore,"background": back}
|
|
if not fgBg: #return dict of both colours
|
|
return highlight
|
|
else: #return specified colour only
|
|
if fgBg == 'fg':
|
|
return highlight["foreground"]
|
|
if fgBg == 'bg':
|
|
return highlight["background"]
|
|
else:
|
|
raise InvalidFgBg('Invalid fgBg specified')
|
|
|
|
def GetThemeDict(self,type,themeName):
|
|
"""
|
|
type - string, 'default' or 'user' theme type
|
|
themeName - string, theme name
|
|
Returns a dictionary which holds {option:value} for each element
|
|
in the specified theme. Values are loaded over a set of ultimate last
|
|
fallback defaults to guarantee that all theme elements are present in
|
|
a newly created theme.
|
|
"""
|
|
if type == 'user':
|
|
cfgParser=self.userCfg['highlight']
|
|
elif type == 'default':
|
|
cfgParser=self.defaultCfg['highlight']
|
|
else:
|
|
raise InvalidTheme('Invalid theme type specified')
|
|
#foreground and background values are provded for each theme element
|
|
#(apart from cursor) even though all these values are not yet used
|
|
#by idle, to allow for their use in the future. Default values are
|
|
#generally black and white.
|
|
theme={ 'normal-foreground':'#000000',
|
|
'normal-background':'#ffffff',
|
|
'keyword-foreground':'#000000',
|
|
'keyword-background':'#ffffff',
|
|
'builtin-foreground':'#000000',
|
|
'builtin-background':'#ffffff',
|
|
'comment-foreground':'#000000',
|
|
'comment-background':'#ffffff',
|
|
'string-foreground':'#000000',
|
|
'string-background':'#ffffff',
|
|
'definition-foreground':'#000000',
|
|
'definition-background':'#ffffff',
|
|
'hilite-foreground':'#000000',
|
|
'hilite-background':'gray',
|
|
'break-foreground':'#ffffff',
|
|
'break-background':'#000000',
|
|
'hit-foreground':'#ffffff',
|
|
'hit-background':'#000000',
|
|
'error-foreground':'#ffffff',
|
|
'error-background':'#000000',
|
|
#cursor (only foreground can be set)
|
|
'cursor-foreground':'#000000',
|
|
#shell window
|
|
'stdout-foreground':'#000000',
|
|
'stdout-background':'#ffffff',
|
|
'stderr-foreground':'#000000',
|
|
'stderr-background':'#ffffff',
|
|
'console-foreground':'#000000',
|
|
'console-background':'#ffffff' }
|
|
for element in theme:
|
|
if not cfgParser.has_option(themeName,element):
|
|
#we are going to return a default, print warning
|
|
warning=('\n Warning: configHandler.py - IdleConf.GetThemeDict'
|
|
' -\n problem retrieving theme element %r'
|
|
'\n from theme %r.\n'
|
|
' returning default value: %r\n' %
|
|
(element, themeName, theme[element]))
|
|
try:
|
|
sys.stderr.write(warning)
|
|
except IOError:
|
|
pass
|
|
colour=cfgParser.Get(themeName,element,default=theme[element])
|
|
theme[element]=colour
|
|
return theme
|
|
|
|
def CurrentTheme(self):
|
|
"""
|
|
Returns the name of the currently active theme
|
|
"""
|
|
return self.GetOption('main','Theme','name',default='')
|
|
|
|
def CurrentKeys(self):
|
|
"""
|
|
Returns the name of the currently active key set
|
|
"""
|
|
return self.GetOption('main','Keys','name',default='')
|
|
|
|
def GetExtensions(self, active_only=True, editor_only=False, shell_only=False):
|
|
"""
|
|
Gets a list of all idle extensions declared in the config files.
|
|
active_only - boolean, if true only return active (enabled) extensions
|
|
"""
|
|
extns=self.RemoveKeyBindNames(
|
|
self.GetSectionList('default','extensions'))
|
|
userExtns=self.RemoveKeyBindNames(
|
|
self.GetSectionList('user','extensions'))
|
|
for extn in userExtns:
|
|
if extn not in extns: #user has added own extension
|
|
extns.append(extn)
|
|
if active_only:
|
|
activeExtns=[]
|
|
for extn in extns:
|
|
if self.GetOption('extensions', extn, 'enable', default=True,
|
|
type='bool'):
|
|
#the extension is enabled
|
|
if editor_only or shell_only:
|
|
if editor_only:
|
|
option = "enable_editor"
|
|
else:
|
|
option = "enable_shell"
|
|
if self.GetOption('extensions', extn,option,
|
|
default=True, type='bool',
|
|
warn_on_default=False):
|
|
activeExtns.append(extn)
|
|
else:
|
|
activeExtns.append(extn)
|
|
return activeExtns
|
|
else:
|
|
return extns
|
|
|
|
def RemoveKeyBindNames(self,extnNameList):
|
|
#get rid of keybinding section names
|
|
names=extnNameList
|
|
kbNameIndicies=[]
|
|
for name in names:
|
|
if name.endswith(('_bindings', '_cfgBindings')):
|
|
kbNameIndicies.append(names.index(name))
|
|
kbNameIndicies.sort()
|
|
kbNameIndicies.reverse()
|
|
for index in kbNameIndicies: #delete each keybinding section name
|
|
del(names[index])
|
|
return names
|
|
|
|
def GetExtnNameForEvent(self,virtualEvent):
|
|
"""
|
|
Returns the name of the extension that virtualEvent is bound in, or
|
|
None if not bound in any extension.
|
|
virtualEvent - string, name of the virtual event to test for, without
|
|
the enclosing '<< >>'
|
|
"""
|
|
extName=None
|
|
vEvent='<<'+virtualEvent+'>>'
|
|
for extn in self.GetExtensions(active_only=0):
|
|
for event in self.GetExtensionKeys(extn):
|
|
if event == vEvent:
|
|
extName=extn
|
|
return extName
|
|
|
|
def GetExtensionKeys(self,extensionName):
|
|
"""
|
|
returns a dictionary of the configurable keybindings for a particular
|
|
extension,as they exist in the dictionary returned by GetCurrentKeySet;
|
|
that is, where previously used bindings are disabled.
|
|
"""
|
|
keysName=extensionName+'_cfgBindings'
|
|
activeKeys=self.GetCurrentKeySet()
|
|
extKeys={}
|
|
if self.defaultCfg['extensions'].has_section(keysName):
|
|
eventNames=self.defaultCfg['extensions'].GetOptionList(keysName)
|
|
for eventName in eventNames:
|
|
event='<<'+eventName+'>>'
|
|
binding=activeKeys[event]
|
|
extKeys[event]=binding
|
|
return extKeys
|
|
|
|
def __GetRawExtensionKeys(self,extensionName):
|
|
"""
|
|
returns a dictionary of the configurable keybindings for a particular
|
|
extension, as defined in the configuration files, or an empty dictionary
|
|
if no bindings are found
|
|
"""
|
|
keysName=extensionName+'_cfgBindings'
|
|
extKeys={}
|
|
if self.defaultCfg['extensions'].has_section(keysName):
|
|
eventNames=self.defaultCfg['extensions'].GetOptionList(keysName)
|
|
for eventName in eventNames:
|
|
binding=self.GetOption('extensions',keysName,
|
|
eventName,default='').split()
|
|
event='<<'+eventName+'>>'
|
|
extKeys[event]=binding
|
|
return extKeys
|
|
|
|
def GetExtensionBindings(self,extensionName):
|
|
"""
|
|
Returns a dictionary of all the event bindings for a particular
|
|
extension. The configurable keybindings are returned as they exist in
|
|
the dictionary returned by GetCurrentKeySet; that is, where re-used
|
|
keybindings are disabled.
|
|
"""
|
|
bindsName=extensionName+'_bindings'
|
|
extBinds=self.GetExtensionKeys(extensionName)
|
|
#add the non-configurable bindings
|
|
if self.defaultCfg['extensions'].has_section(bindsName):
|
|
eventNames=self.defaultCfg['extensions'].GetOptionList(bindsName)
|
|
for eventName in eventNames:
|
|
binding=self.GetOption('extensions',bindsName,
|
|
eventName,default='').split()
|
|
event='<<'+eventName+'>>'
|
|
extBinds[event]=binding
|
|
|
|
return extBinds
|
|
|
|
def GetKeyBinding(self, keySetName, eventStr):
|
|
"""
|
|
returns the keybinding for a specific event.
|
|
keySetName - string, name of key binding set
|
|
eventStr - string, the virtual event we want the binding for,
|
|
represented as a string, eg. '<<event>>'
|
|
"""
|
|
eventName=eventStr[2:-2] #trim off the angle brackets
|
|
binding=self.GetOption('keys',keySetName,eventName,default='').split()
|
|
return binding
|
|
|
|
def GetCurrentKeySet(self):
|
|
result = self.GetKeySet(self.CurrentKeys())
|
|
|
|
if macosxSupport.runningAsOSXApp():
|
|
# We're using AquaTk, replace all keybingings that use the
|
|
# Alt key by ones that use the Option key because the former
|
|
# don't work reliably.
|
|
for k, v in result.items():
|
|
v2 = [ x.replace('<Alt-', '<Option-') for x in v ]
|
|
if v != v2:
|
|
result[k] = v2
|
|
|
|
return result
|
|
|
|
def GetKeySet(self,keySetName):
|
|
"""
|
|
Returns a dictionary of: all requested core keybindings, plus the
|
|
keybindings for all currently active extensions. If a binding defined
|
|
in an extension is already in use, that binding is disabled.
|
|
"""
|
|
keySet=self.GetCoreKeys(keySetName)
|
|
activeExtns=self.GetExtensions(active_only=1)
|
|
for extn in activeExtns:
|
|
extKeys=self.__GetRawExtensionKeys(extn)
|
|
if extKeys: #the extension defines keybindings
|
|
for event in extKeys:
|
|
if extKeys[event] in keySet.values():
|
|
#the binding is already in use
|
|
extKeys[event]='' #disable this binding
|
|
keySet[event]=extKeys[event] #add binding
|
|
return keySet
|
|
|
|
def IsCoreBinding(self,virtualEvent):
|
|
"""
|
|
returns true if the virtual event is bound in the core idle keybindings.
|
|
virtualEvent - string, name of the virtual event to test for, without
|
|
the enclosing '<< >>'
|
|
"""
|
|
return ('<<'+virtualEvent+'>>') in self.GetCoreKeys()
|
|
|
|
def GetCoreKeys(self, keySetName=None):
|
|
"""
|
|
returns the requested set of core keybindings, with fallbacks if
|
|
required.
|
|
Keybindings loaded from the config file(s) are loaded _over_ these
|
|
defaults, so if there is a problem getting any core binding there will
|
|
be an 'ultimate last resort fallback' to the CUA-ish bindings
|
|
defined here.
|
|
"""
|
|
keyBindings={
|
|
'<<copy>>': ['<Control-c>', '<Control-C>'],
|
|
'<<cut>>': ['<Control-x>', '<Control-X>'],
|
|
'<<paste>>': ['<Control-v>', '<Control-V>'],
|
|
'<<beginning-of-line>>': ['<Control-a>', '<Home>'],
|
|
'<<center-insert>>': ['<Control-l>'],
|
|
'<<close-all-windows>>': ['<Control-q>'],
|
|
'<<close-window>>': ['<Alt-F4>'],
|
|
'<<do-nothing>>': ['<Control-x>'],
|
|
'<<end-of-file>>': ['<Control-d>'],
|
|
'<<python-docs>>': ['<F1>'],
|
|
'<<python-context-help>>': ['<Shift-F1>'],
|
|
'<<history-next>>': ['<Alt-n>'],
|
|
'<<history-previous>>': ['<Alt-p>'],
|
|
'<<interrupt-execution>>': ['<Control-c>'],
|
|
'<<view-restart>>': ['<F6>'],
|
|
'<<restart-shell>>': ['<Control-F6>'],
|
|
'<<open-class-browser>>': ['<Alt-c>'],
|
|
'<<open-module>>': ['<Alt-m>'],
|
|
'<<open-new-window>>': ['<Control-n>'],
|
|
'<<open-window-from-file>>': ['<Control-o>'],
|
|
'<<plain-newline-and-indent>>': ['<Control-j>'],
|
|
'<<print-window>>': ['<Control-p>'],
|
|
'<<redo>>': ['<Control-y>'],
|
|
'<<remove-selection>>': ['<Escape>'],
|
|
'<<save-copy-of-window-as-file>>': ['<Alt-Shift-S>'],
|
|
'<<save-window-as-file>>': ['<Alt-s>'],
|
|
'<<save-window>>': ['<Control-s>'],
|
|
'<<select-all>>': ['<Alt-a>'],
|
|
'<<toggle-auto-coloring>>': ['<Control-slash>'],
|
|
'<<undo>>': ['<Control-z>'],
|
|
'<<find-again>>': ['<Control-g>', '<F3>'],
|
|
'<<find-in-files>>': ['<Alt-F3>'],
|
|
'<<find-selection>>': ['<Control-F3>'],
|
|
'<<find>>': ['<Control-f>'],
|
|
'<<replace>>': ['<Control-h>'],
|
|
'<<goto-line>>': ['<Alt-g>'],
|
|
'<<smart-backspace>>': ['<Key-BackSpace>'],
|
|
'<<newline-and-indent>>': ['<Key-Return> <Key-KP_Enter>'],
|
|
'<<smart-indent>>': ['<Key-Tab>'],
|
|
'<<indent-region>>': ['<Control-Key-bracketright>'],
|
|
'<<dedent-region>>': ['<Control-Key-bracketleft>'],
|
|
'<<comment-region>>': ['<Alt-Key-3>'],
|
|
'<<uncomment-region>>': ['<Alt-Key-4>'],
|
|
'<<tabify-region>>': ['<Alt-Key-5>'],
|
|
'<<untabify-region>>': ['<Alt-Key-6>'],
|
|
'<<toggle-tabs>>': ['<Alt-Key-t>'],
|
|
'<<change-indentwidth>>': ['<Alt-Key-u>'],
|
|
'<<del-word-left>>': ['<Control-Key-BackSpace>'],
|
|
'<<del-word-right>>': ['<Control-Key-Delete>']
|
|
}
|
|
if keySetName:
|
|
for event in keyBindings:
|
|
binding=self.GetKeyBinding(keySetName,event)
|
|
if binding:
|
|
keyBindings[event]=binding
|
|
else: #we are going to return a default, print warning
|
|
warning=('\n Warning: configHandler.py - IdleConf.GetCoreKeys'
|
|
' -\n problem retrieving key binding for event %r'
|
|
'\n from key set %r.\n'
|
|
' returning default value: %r\n' %
|
|
(event, keySetName, keyBindings[event]))
|
|
try:
|
|
sys.stderr.write(warning)
|
|
except IOError:
|
|
pass
|
|
return keyBindings
|
|
|
|
def GetExtraHelpSourceList(self,configSet):
|
|
"""Fetch list of extra help sources from a given configSet.
|
|
|
|
Valid configSets are 'user' or 'default'. Return a list of tuples of
|
|
the form (menu_item , path_to_help_file , option), or return the empty
|
|
list. 'option' is the sequence number of the help resource. 'option'
|
|
values determine the position of the menu items on the Help menu,
|
|
therefore the returned list must be sorted by 'option'.
|
|
|
|
"""
|
|
helpSources=[]
|
|
if configSet=='user':
|
|
cfgParser=self.userCfg['main']
|
|
elif configSet=='default':
|
|
cfgParser=self.defaultCfg['main']
|
|
else:
|
|
raise InvalidConfigSet('Invalid configSet specified')
|
|
options=cfgParser.GetOptionList('HelpFiles')
|
|
for option in options:
|
|
value=cfgParser.Get('HelpFiles',option,default=';')
|
|
if value.find(';')==-1: #malformed config entry with no ';'
|
|
menuItem='' #make these empty
|
|
helpPath='' #so value won't be added to list
|
|
else: #config entry contains ';' as expected
|
|
value=value.split(';')
|
|
menuItem=value[0].strip()
|
|
helpPath=value[1].strip()
|
|
if menuItem and helpPath: #neither are empty strings
|
|
helpSources.append( (menuItem,helpPath,option) )
|
|
helpSources.sort(key=lambda x: x[2])
|
|
return helpSources
|
|
|
|
def GetAllExtraHelpSourcesList(self):
|
|
"""
|
|
Returns a list of tuples containing the details of all additional help
|
|
sources configured, or an empty list if there are none. Tuples are of
|
|
the format returned by GetExtraHelpSourceList.
|
|
"""
|
|
allHelpSources=( self.GetExtraHelpSourceList('default')+
|
|
self.GetExtraHelpSourceList('user') )
|
|
return allHelpSources
|
|
|
|
def LoadCfgFiles(self):
|
|
"""
|
|
load all configuration files.
|
|
"""
|
|
for key in self.defaultCfg:
|
|
self.defaultCfg[key].Load()
|
|
self.userCfg[key].Load() #same keys
|
|
|
|
def SaveUserCfgFiles(self):
|
|
"""
|
|
write all loaded user configuration files back to disk
|
|
"""
|
|
for key in self.userCfg:
|
|
self.userCfg[key].Save()
|
|
|
|
idleConf=IdleConf()
|
|
|
|
### module test
|
|
if __name__ == '__main__':
|
|
def dumpCfg(cfg):
|
|
print('\n',cfg,'\n')
|
|
for key in cfg:
|
|
sections=cfg[key].sections()
|
|
print(key)
|
|
print(sections)
|
|
for section in sections:
|
|
options=cfg[key].options(section)
|
|
print(section)
|
|
print(options)
|
|
for option in options:
|
|
print(option, '=', cfg[key].Get(section,option))
|
|
dumpCfg(idleConf.defaultCfg)
|
|
dumpCfg(idleConf.userCfg)
|
|
print(idleConf.userCfg['main'].Get('Theme','name'))
|
|
#print idleConf.userCfg['highlight'].GetDefHighlight('Foo','normal')
|