Mailman 3 October 2005 - Python-checkins

commit of r41343 - peps/trunk
by brett.cannon＠python.org 28 Oct '05

28 Oct '05

Author: brett.cannon Date: Fri Oct 28 21:35:57 2005 New Revision: 41343 Modified: peps/trunk/pep-0352.txt Log: Merge in suggestions from Neal Norwitz. - Simplified __init__ and fixed __getitem__ - Added another way to catch all exceptions sans KeyboardInterrupt and SystemExit as Python stands now (does not invalidate argument that it it needlessly explicit) - Added a diagram of how the exception hierarchy will look - Small grammar and clarification fixes Modified: peps/trunk/pep-0352.txt ============================================================================== --- peps/trunk/pep-0352.txt (original) +++ peps/trunk/pep-0352.txt Fri Oct 28 21:35:57 2005 @@ -22,10 +22,10 @@ inherit from. Imposing the restriction will allow a standard interface for exceptions to exist that can be relied upon. -On might counter that requiring a specific base class for a particular -interface is unPythonic. However, in the specific case of exceptions -there's a good reason (which has generally been agreed to on -python-dev): requiring hierarchy helps code that wants to *catch* +One might counter that requiring a specific base class for a +particular interface is unPythonic. However, in the specific case of +exceptions there's a good reason (which has generally been agreed to +on python-dev): requiring hierarchy helps code that wants to *catch* exceptions by making it possible to catch *all* exceptions explicitly by writing ``except BaseException:`` instead of ``except *:``. [#hierarchy-good]_ @@ -48,7 +48,8 @@ ============================= This PEP proposes introducing a new exception named BaseException that -is a new-style class and has a single attribute, ``message``:: +is a new-style class and has a single attribute, ``message`` (that +will cause the deprecation of the existing ``args`` attribute):: class BaseException(object): @@ -65,9 +66,7 @@ def __init__(self, message='', *args): """Set 'message' and 'args' attribute""" self.message = message - self.args = (message,) - if args: - self.args += args + self.args = (message,) + args def __str__(self): """Return the str of 'message'""" @@ -97,10 +96,7 @@ deprecated. """ - if index == 0: - return self.message - else: - return self.args[index-1] + return self.args[index] The ``message`` attribute will contain either the argument passed in @@ -114,13 +110,13 @@ This provides backwards-compatibility with how the argument passed into Exception has no restrictions. -The ``args`` attribute is to be deprecated. While allowing multiple +The ``args`` attribute is deprecated. While allowing multiple arguments to be passed can be helpful, it is in no way essential. It -also does not make it necessarily clear which argument is going to be -represented by the ``__str__`` method. Restricting to a single -argument keeps the API simple and clear. This also means providing a -``__getitem__`` method is unneeded for exceptions and thus will be -deprecated as well. +also does not make it clear which argument is going to be represented +by the ``__str__`` method. Restricting initialization to accepting a +single argument keeps the API simple and clear. This also means +providing a ``__getitem__`` method is unneeded for exceptions and thus +will be deprecated as well. The ``raise`` statement will be changed to require that any object passed to it must inherit from BaseException. This will make sure @@ -141,11 +137,27 @@ basic root, a change to the existing hierarchy is called for. As it stands now, if one wants to catch all exceptions that signal an error *and* do not mean the interpreter should be allowed to exit, you must -specify all but two exceptions specifically in an ``except`` clause. +specify all but two exceptions specifically in an ``except`` clause +or catch the two exceptions separately and then re-raise them and +have all other exceptions fall through to a bare ``except`` clause:: + + except (KeyboardInterrupt, SystemExit): + raise + except: + ... + That is needlessly explicit. This PEP proposes moving KeyboardInterrupt and SystemExit to inherit directly from BaseException. +:: + + - BaseException + |- KeyboardInterrupt + |- SystemExit + |- Exception + |- (all other current built-in exceptions) + Doing this makes catching Exception more reasonable. It would catch only exceptions that signify errors. Exceptions that signal that the intepreter should exit will not be caught and thus be allowed to

1 0

commit of r41342 - in python/trunk: Lib Lib/test Mac/Tools/IDE Misc Objects PC/os2emx Tools/msi
by fred.drake＠python.org 28 Oct '05

28 Oct '05

Author: fred.drake Date: Fri Oct 28 16:39:47 2005 New Revision: 41342 Modified: python/trunk/Lib/pydoc.py python/trunk/Lib/test/test_dircache.py python/trunk/Lib/test/test_threadsignals.py python/trunk/Lib/trace.py python/trunk/Mac/Tools/IDE/Wsocket.py python/trunk/Misc/cheatsheet python/trunk/Objects/unicodeobject.c python/trunk/PC/os2emx/dlfcn.c python/trunk/PC/os2emx/dlfcn.h python/trunk/Tools/msi/uisample.py Log: fix typos, mostly in comments Modified: python/trunk/Lib/pydoc.py ============================================================================== --- python/trunk/Lib/pydoc.py (original) +++ python/trunk/Lib/pydoc.py Fri Oct 28 16:39:47 2005 @@ -273,7 +273,7 @@ # Did the error occur before or after the module was found? (exc, value, tb) = info = sys.exc_info() if path in sys.modules: - # An error occured while executing the imported module. + # An error occurred while executing the imported module. raise ErrorDuringImport(sys.modules[path].__file__, info) elif exc is SyntaxError: # A SyntaxError occurred before we could execute the module. Modified: python/trunk/Lib/test/test_dircache.py ============================================================================== --- python/trunk/Lib/test/test_dircache.py (original) +++ python/trunk/Lib/test/test_dircache.py Fri Oct 28 16:39:47 2005 @@ -46,7 +46,7 @@ if sys.platform[:3] not in ('win', 'os2'): # Sadly, dircache has the same granularity as stat.mtime, and so - # can't notice any changes that occured within 1 sec of the last + # can't notice any changes that occurred within 1 sec of the last # time it examined a directory. time.sleep(1) self.writeTemp("test1") Modified: python/trunk/Lib/test/test_threadsignals.py ============================================================================== --- python/trunk/Lib/test/test_threadsignals.py (original) +++ python/trunk/Lib/test/test_threadsignals.py Fri Oct 28 16:39:47 2005 @@ -21,7 +21,7 @@ return usr1, usr2, alrm -# The signal handler. Just note that the signal occured and +# The signal handler. Just note that the signal occurred and # from who. def handle_signals(sig,frame): signal_blackboard[sig]['tripped'] += 1 Modified: python/trunk/Lib/trace.py ============================================================================== --- python/trunk/Lib/trace.py (original) +++ python/trunk/Lib/trace.py Fri Oct 28 16:39:47 2005 @@ -133,7 +133,7 @@ # the ignore list n = len(mod) # (will not overflow since if the first n characters are the - # same and the name has not already occured, then the size + # same and the name has not already occurred, then the size # of "name" is greater than that of "mod") if mod == modulename[:n] and modulename[n] == '.': self._ignore[modulename] = 1 Modified: python/trunk/Mac/Tools/IDE/Wsocket.py ============================================================================== --- python/trunk/Mac/Tools/IDE/Wsocket.py (original) +++ python/trunk/Mac/Tools/IDE/Wsocket.py Fri Oct 28 16:39:47 2005 @@ -163,7 +163,7 @@ def settotal(int total): gets called when the connection knows the data size def setcurrent(int current): gets called when some new data has arrived def done(): gets called when the transaction is complete - def error(type, value, tb): gets called wheneven an error occured + def error(type, value, tb): gets called wheneven an error occurred """ def __init__(self, settotal_func, setcurrent_func, done_func, error_func): Modified: python/trunk/Misc/cheatsheet ============================================================================== --- python/trunk/Misc/cheatsheet (original) +++ python/trunk/Misc/cheatsheet Fri Oct 28 16:39:47 2005 @@ -1308,7 +1308,7 @@ tb_next (frame/None, R/O): next level in stack trace (toward the frame where the exception occurred) tb_frame (frame, R/O): execution frame of the current level - tb_lineno (int, R/O): line number where the exception occured + tb_lineno (int, R/O): line number where the exception occurred tb_lasti (int, R/O): precise instruction (index into bytecode) Slices: @@ -1597,7 +1597,7 @@ maxsplit=0]]) join(words[, sep=' Concatenate a list or tuple of words with ']) interveningseparators; inverse of split. -replace(s, old, Returns a copy of string <s> with all occurences of +replace(s, old, Returns a copy of string <s> with all occurrences of new[, maxsplit=0] substring<old> replaced by <new>. Limits to <maxsplit> firstsubstitutions if specified. strip(s) Return a string that is (a copy of) <s> without leadingand @@ -1620,7 +1620,7 @@ $ matches end of the string (of every line in MULTILINE mode) * 0 or more of preceding regular expression (as many as possible) + 1 or more of preceding regular expression (as many as possible) -? 0 or 1 occurence of preceding regular expression +? 0 or 1 occurrence of preceding regular expression *?, +?, ?? Same as *, + and ? but matches as few characters as possible {m,n} matches from m to n repetitions of preceding RE {m,n}? idem, attempting to match as few repetitions as possible Modified: python/trunk/Objects/unicodeobject.c ============================================================================== --- python/trunk/Objects/unicodeobject.c (original) +++ python/trunk/Objects/unicodeobject.c Fri Oct 28 16:39:47 2005 @@ -734,7 +734,7 @@ /* error handling callback helper: build arguments, call the callback and check the arguments, - if no exception occured, copy the replacement to the output + if no exception occurred, copy the replacement to the output and adjust various state variables. return 0 on success, -1 on error */ @@ -2987,7 +2987,7 @@ /* Lookup the character ch in the mapping. If the character can't be found, Py_None is returned (or NULL, if another - error occured). */ + error occurred). */ static PyObject *charmapencode_lookup(Py_UNICODE c, PyObject *mapping) { PyObject *w = PyInt_FromLong((long)c); Modified: python/trunk/PC/os2emx/dlfcn.c ============================================================================== --- python/trunk/PC/os2emx/dlfcn.c (original) +++ python/trunk/PC/os2emx/dlfcn.c Fri Oct 28 16:39:47 2005 @@ -216,7 +216,7 @@ } } -/* return a string describing last occured dl error */ +/* return a string describing last occurred dl error */ char *dlerror() { return dlerr; Modified: python/trunk/PC/os2emx/dlfcn.h ============================================================================== --- python/trunk/PC/os2emx/dlfcn.h (original) +++ python/trunk/PC/os2emx/dlfcn.h Fri Oct 28 16:39:47 2005 @@ -45,7 +45,7 @@ /* free dynamicaly-linked library */ int dlclose(void *handle); -/* return a string describing last occured dl error */ +/* return a string describing last occurred dl error */ char *dlerror(void); #endif /* !_DLFCN_H */ Modified: python/trunk/Tools/msi/uisample.py ============================================================================== --- python/trunk/Tools/msi/uisample.py (original) +++ python/trunk/Tools/msi/uisample.py Fri Oct 28 16:39:47 2005 @@ -1,3 +1,4 @@ + import msilib,os;dirname=os.path.dirname(__file__) AdminExecuteSequence = [ (u'InstallValidate', None, 1400), @@ -1393,7 +1394,7 @@ (1932, u'The Windows Installer service cannot update the protected Windows file [2]. {{Package version: [3], OS Protected version: [4], SFP Error: [5]}}'), (1933, u'The Windows Installer service cannot update one or more protected Windows files. {{SFP Error: [2]. List of protected files:\\r\\n[3]}}'), (1934, u'User installations are disabled via policy on the machine.'), -(1935, u'An error occured during the installation of assembly component [2]. HRESULT: [3]. {{assembly interface: [4], function: [5], assembly name: [6]}}'), +(1935, u'An error occurred during the installation of assembly component [2]. HRESULT: [3]. {{assembly interface: [4], function: [5], assembly name: [6]}}'), ] tables=['AdminExecuteSequence', 'AdminUISequence', 'AdvtExecuteSequence', 'BBControl', 'Billboard', 'Binary', 'CheckBox', 'Property', 'ComboBox', 'Control', 'ListBox', 'ActionText', 'ControlCondition', 'ControlEvent', 'Dialog', 'EventMapping', 'InstallExecuteSequence', 'InstallUISequence', 'ListView', 'RadioButton', 'TextStyle', 'UIText', '_Validation', 'Error']

1 0

commit of r41341 - in python/branches/release24-maint: Lib Lib/test Misc
by neal.norwitz＠python.org 28 Oct '05

28 Oct '05

Author: neal.norwitz Date: Fri Oct 28 08:00:51 2005 New Revision: 41341 Modified: python/branches/release24-maint/Lib/tarfile.py python/branches/release24-maint/Lib/test/test_tarfile.py python/branches/release24-maint/Misc/NEWS Log: Backport: - Patch #1338314, Bug #1336623: fix tarfile so it can extract REGTYPE directories from tarfiles written by old programs. Modified: python/branches/release24-maint/Lib/tarfile.py ============================================================================== --- python/branches/release24-maint/Lib/tarfile.py (original) +++ python/branches/release24-maint/Lib/tarfile.py Fri Oct 28 08:00:51 2005 @@ -688,6 +688,11 @@ tarinfo.devmajor = tarinfo.devmajor = 0 tarinfo.prefix = buf[345:500] + # Some old tar programs represent a directory as a regular + # file with a trailing slash. + if tarinfo.isreg() and tarinfo.name.endswith("/"): + tarinfo.type = DIRTYPE + # The prefix field is used for filenames > 100 in # the POSIX standard. # name = prefix + '/' + name @@ -695,7 +700,7 @@ tarinfo.name = normpath(os.path.join(nts(tarinfo.prefix), tarinfo.name)) # Directory names should have a '/' at the end. - if tarinfo.isdir() and tarinfo.name[-1:] != "/": + if tarinfo.isdir(): tarinfo.name += "/" return tarinfo @@ -1628,10 +1633,6 @@ # Skip the following data blocks. self.offset += self._block(tarinfo.size) - if tarinfo.isreg() and tarinfo.name[:-1] == "/": - # some old tar programs don't know DIRTYPE - tarinfo.type = DIRTYPE - self.members.append(tarinfo) return tarinfo Modified: python/branches/release24-maint/Lib/test/test_tarfile.py ============================================================================== --- python/branches/release24-maint/Lib/test/test_tarfile.py (original) +++ python/branches/release24-maint/Lib/test/test_tarfile.py Fri Oct 28 08:00:51 2005 @@ -134,6 +134,30 @@ "readlines() after seek failed") fobj.close() + def test_old_dirtype(self): + """Test old style dirtype member (bug #1336623). + """ + # Old tars create directory members using a REGTYPE + # header with a "/" appended to the filename field. + + # Create an old tar style directory entry. + filename = tmpname() + tarinfo = tarfile.TarInfo("directory/") + tarinfo.type = tarfile.REGTYPE + + fobj = file(filename, "w") + fobj.write(tarinfo.tobuf()) + fobj.close() + + # Test if it is still a directory entry when + # read back. + tar = tarfile.open(filename) + tarinfo = tar.getmembers()[0] + tar.close() + + self.assert_(tarinfo.type == tarfile.DIRTYPE) + self.assert_(tarinfo.name.endswith("/")) + class ReadStreamTest(ReadTest): sep = "|" Modified: python/branches/release24-maint/Misc/NEWS ============================================================================== --- python/branches/release24-maint/Misc/NEWS (original) +++ python/branches/release24-maint/Misc/NEWS Fri Oct 28 08:00:51 2005 @@ -25,6 +25,9 @@ Extension Modules ----------------- +- Patch #1338314, Bug #1336623: fix tarfile so it can extract + REGTYPE directories from tarfiles written by old programs. + - Patch #1309009, Fix segfault in pyexpat when the XML document is in latin_1, but Python incorrectly assumes it is in UTF-8 format

1 0

commit of r41340 - in python/trunk: Lib Lib/test Misc
by neal.norwitz＠python.org 28 Oct '05

28 Oct '05

Author: neal.norwitz Date: Fri Oct 28 07:52:22 2005 New Revision: 41340 Modified: python/trunk/Lib/tarfile.py python/trunk/Lib/test/test_tarfile.py python/trunk/Misc/NEWS Log: Patch #1338314, Bug #1336623: fix tarfile so it can extract REGTYPE directories from tarfiles written by old programs. Will backport. Modified: python/trunk/Lib/tarfile.py ============================================================================== --- python/trunk/Lib/tarfile.py (original) +++ python/trunk/Lib/tarfile.py Fri Oct 28 07:52:22 2005 @@ -739,6 +739,11 @@ tarinfo.devmajor = tarinfo.devmajor = 0 tarinfo.prefix = buf[345:500] + # Some old tar programs represent a directory as a regular + # file with a trailing slash. + if tarinfo.isreg() and tarinfo.name.endswith("/"): + tarinfo.type = DIRTYPE + # The prefix field is used for filenames > 100 in # the POSIX standard. # name = prefix + '/' + name @@ -746,7 +751,7 @@ tarinfo.name = normpath(os.path.join(nts(tarinfo.prefix), tarinfo.name)) # Directory names should have a '/' at the end. - if tarinfo.isdir() and tarinfo.name[-1:] != "/": + if tarinfo.isdir(): tarinfo.name += "/" return tarinfo @@ -1716,10 +1721,6 @@ # Skip the following data blocks. self.offset += self._block(tarinfo.size) - if tarinfo.isreg() and tarinfo.name[:-1] == "/": - # some old tar programs don't know DIRTYPE - tarinfo.type = DIRTYPE - self.members.append(tarinfo) return tarinfo Modified: python/trunk/Lib/test/test_tarfile.py ============================================================================== --- python/trunk/Lib/test/test_tarfile.py (original) +++ python/trunk/Lib/test/test_tarfile.py Fri Oct 28 07:52:22 2005 @@ -144,6 +144,36 @@ "readlines() after seek failed") fobj.close() + def test_old_dirtype(self): + """Test old style dirtype member (bug #1336623). + """ + # Old tars create directory members using a REGTYPE + # header with a "/" appended to the filename field. + + # Create an old tar style directory entry. + filename = tmpname() + tarinfo = tarfile.TarInfo("directory/") + tarinfo.type = tarfile.REGTYPE + + fobj = file(filename, "w") + fobj.write(tarinfo.tobuf()) + fobj.close() + + try: + # Test if it is still a directory entry when + # read back. + tar = tarfile.open(filename) + tarinfo = tar.getmembers()[0] + tar.close() + + self.assert_(tarinfo.type == tarfile.DIRTYPE) + self.assert_(tarinfo.name.endswith("/")) + finally: + try: + os.unlink(filename) + except: + pass + class ReadStreamTest(ReadTest): sep = "|" Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Fri Oct 28 07:52:22 2005 @@ -177,6 +177,9 @@ Extension Modules ----------------- +- Patch #1338314, Bug #1336623: fix tarfile so it can extract + REGTYPE directories from tarfiles written by old programs. + - Get bsddb module to build with BSD DB version 3.2 - Patch #1309009, Fix segfault in pyexpat when the XML document is in latin_1,

1 0

commit of r41339 - peps/trunk
by brett.cannon＠python.org 28 Oct '05

28 Oct '05

Author: brett.cannon Date: Fri Oct 28 04:53:49 2005 New Revision: 41339 Added: peps/trunk/pep-0352.txt Modified: peps/trunk/pep-0000.txt Log: Check in initial version of PEP 352: Required Superclass for Exceptions. Modified: peps/trunk/pep-0000.txt ============================================================================== --- peps/trunk/pep-0000.txt (original) +++ peps/trunk/pep-0000.txt Fri Oct 28 04:53:49 2005 @@ -107,9 +107,10 @@ S 349 Allow str() to return unicode strings Schemenauer I 350 Codetags Elliott S 351 The freeze protocol Warsaw + S 352 Required Superclass for Exceptions GvR, Cannon S 754 IEEE 754 Floating Point Special Values Warnes - Finished PEPs (done, implemented in CVS) + Finished PEPs (done, implemented in Subversion) SF 100 Python Unicode Integration Lemburg IF 160 Python 1.6 Release Schedule Drake @@ -398,6 +399,7 @@ S 349 Allow str() to return unicode strings Schemenauer I 350 Codetags Elliott S 351 The freeze protocol Warsaw + S 352 Required Superclass for Exceptions GvR, Cannon SR 666 Reject Foolish Indentation Creighton S 754 IEEE 754 Floating Point Special Values Warnes I 3000 Python 3.0 Plans Kuchling, Cannon Added: peps/trunk/pep-0352.txt ============================================================================== --- (empty file) +++ peps/trunk/pep-0352.txt Fri Oct 28 04:53:49 2005 @@ -0,0 +1,233 @@ +PEP: 352 +Title: Required Superclass for Exceptions +Version: $Revision: 1.5 $ +Last-Modified: $Date: 2005/06/07 13:17:37 $ +Author: Brett Cannon <brett(a)python.org>, Guido van Rossum <guido(a)python.org> +Status: Draft +Type: Standards Track +Content-Type: text/x-rst +Created: 27-Oct-2005 +Post-History: + + +Abstract +======== + +In Python 2.4 and before, any (classic) class can be raised as an +exception. The plan is to allow new-style classes starting in Python +2.5, but this makes the problem worse -- it would mean *any* class (or +instance) can be raised! This is a problem since it prevents any +guarantees to be made about the interface of exceptions. This PEP +proposes introducing a new superclass that all raised objects must +inherit from. Imposing the restriction will allow a standard +interface for exceptions to exist that can be relied upon. + +On might counter that requiring a specific base class for a particular +interface is unPythonic. However, in the specific case of exceptions +there's a good reason (which has generally been agreed to on +python-dev): requiring hierarchy helps code that wants to *catch* +exceptions by making it possible to catch *all* exceptions explicitly +by writing ``except BaseException:`` instead of +``except *:``. [#hierarchy-good]_ + +Introducing a new superclass for exceptions also gives us the chance +to rearrange the exception hierarchy slightly for the better. As it +currently stands, all exceptions in the built-in namespace inherit +from Exception. This is a problem since this includes two exceptions +(KeyboardInterrupt and SystemExit) that are usually meant to signal +that the interpreter should be shut down. Changing it so that these +two exceptions inherit from the common superclass instead of Exception +will make it easy for people to write ``except`` clauses that are not +overreaching and not catch exceptions that should propagate up and +terminate the interpreter. + +This PEP is based on previous work done for PEP 348 [#pep348]_. + + +Requiring a Common Superclass +============================= + +This PEP proposes introducing a new exception named BaseException that +is a new-style class and has a single attribute, ``message``:: + + class BaseException(object): + + """Superclass representing the base of the exception hierarchy. + + Provides a 'message' attribute that contains any argument + passed in during instantiation. + + The 'args' attribute and __getitem__ method are provided for + backwards-compatibility and will be deprecated at some point. + + """ + + def __init__(self, message='', *args): + """Set 'message' and 'args' attribute""" + self.message = message + self.args = (message,) + if args: + self.args += args + + def __str__(self): + """Return the str of 'message'""" + if len(self.args) > 1: + return str(self.args) + else: + return str(self.message) + + def __unicode__(self): + """Return the unicode of 'message'""" + if len(self.args) > 1: + return unicode(self.args) + else: + return unicode(self.message) + + def __repr__(self): + if len(self.args) > 1: + args_repr = "*%s" % self.args + else: + args_repr = repr(self.message) + return "%s(%s)" % (self.__class__.__name__, args_repr) + + def __getitem__(self, index): + """Index into arguments passed in during instantiation. + + Provided for backwards-compatibility and will be + deprecated. + + """ + if index == 0: + return self.message + else: + return self.args[index-1] + + +The ``message`` attribute will contain either the argument passed in +at instantiation of the object or the empty string. The attribute is +meant to act as a common location to store any extra information that +is to be passed along with the exception that goes beyond the location +of the exception within the exception hierarchy and the exception's +type. + +No restriction is placed upon what may be passed in for ``messsage``. +This provides backwards-compatibility with how the argument passed +into Exception has no restrictions. + +The ``args`` attribute is to be deprecated. While allowing multiple +arguments to be passed can be helpful, it is in no way essential. It +also does not make it necessarily clear which argument is going to be +represented by the ``__str__`` method. Restricting to a single +argument keeps the API simple and clear. This also means providing a +``__getitem__`` method is unneeded for exceptions and thus will be +deprecated as well. + +The ``raise`` statement will be changed to require that any object +passed to it must inherit from BaseException. This will make sure +that all exceptions fall within a single hierarchy that is anchored at +BaseException [#hierarchy-good]_. This also guarantees a basic +interface that is inherited from BaseException. The change to +``raise`` will be enforced starting in Python 3.0 (see the `Transition +Plan`_ below). + +With BaseException being the root of the exception hierarchy, +Exception will now inherit from it. + + +Exception Hierarchy Changes +=========================== + +With the exception hierarchy now even more important since it has a +basic root, a change to the existing hierarchy is called for. As it +stands now, if one wants to catch all exceptions that signal an error +*and* do not mean the interpreter should be allowed to exit, you must +specify all but two exceptions specifically in an ``except`` clause. +That is needlessly explicit. This PEP proposes moving +KeyboardInterrupt and SystemExit to inherit directly from +BaseException. + +Doing this makes catching Exception more reasonable. It would catch +only exceptions that signify errors. Exceptions that signal that the +intepreter should exit will not be caught and thus be allowed to +propagate up and allow the interpreter to terminate. + +KeyboardInterrupt has been moved since users typically expect an +application to exit when the press the interrupt key (usually Ctrl-C). +If people have overly broad ``except`` clauses the expected behaviour +does not occur. + +SystemExit has been moved for similar reasons. Since the exception is +raised when ``sys.exit()`` is called the interpreter should normally +be allowed to terminate. Unfortunately overly broad ``except`` +clauses can prevent the exit to occur which had been explicitly +requested. + +To make sure that people catch Exception most of the time, various +parts of the documentation and tutorials will need to be updated to +strongly suggest that Exception be what programmers want to use. Bare +``except`` clauses or catching BaseException directly should be +discouraged based on the fact that KeyboardInterrupt and SystemExit +almost always should be allowed to propagate up. + + +Transition Plan +=============== + +Since semantic changes to Python are being proposed, a transition plan +is needed. The goal is to end up with the new semantics being used in +Python 3.0 while providing a smooth transition for 2.x code. All +deprecations mentioned in the plan will lead to the removal of the +semantics starting in the version following the introduction of the +deprecation. + +* Python 2.5 + + - introduce BaseException + + + allow exceptions to be new-style classes + + + all standard exceptions become new-style classes + + - Exception, KeyboardInterrupt, and SystemExit inherit from BaseException + + - deprecate raising string exceptions + +* Python 2.6 + + - deprecate catching string exceptions + +* Python 2.7 + + - deprecate raising exceptions that do not inherit from BaseException + +* Python 2.8 + + - deprecate catching exceptions that do not inherit from BaseException + + - deprecate ``args`` and ``__getitem__`` + + +References +========== + +.. [#pep348] PEP 348 (Exception Reorganization for Python 3.0) + http://www.python.org/peps/pep-0348.html + +.. [#hierarchy-good] python-dev Summary for 2004-08-01 through 2004-08-15 + http://www.python.org/dev/summary/2004-08-01_2004-08-15.html#an-exception-i… + + +Copyright +========= + +This document has been placed in the public domain. + + + +.. + Local Variables: + mode: indented-text + indent-tabs-mode: nil + sentence-end-double-space: t + fill-column: 70 + End:

1 0

commit of r41338 - python/trunk/Doc/inst
by martin.v.loewis＠python.org 27 Oct '05

27 Oct '05

Author: martin.v.loewis Date: Thu Oct 27 20:56:22 2005 New Revision: 41338 Modified: python/trunk/Doc/inst/inst.tex Log: Update instructions according to Dave Abrahams instructions. Modified: python/trunk/Doc/inst/inst.tex ============================================================================== --- python/trunk/Doc/inst/inst.tex (original) +++ python/trunk/Doc/inst/inst.tex Thu Oct 27 20:56:22 2005 @@ -1030,6 +1030,9 @@ \subsubsection{GNU C / Cygwin / MinGW} +These instructions only apply if you're using a version of Python prior +to 2.4.1 with a MinGW prior to 3.0.0 (with binutils-2.13.90-20030111-1). + This section describes the necessary steps to use Distutils with the GNU C/\Cpp{} compilers in their Cygwin and MinGW distributions.\footnote{Check

1 0

commit of r41337 - peps/trunk
by martin.v.loewis＠python.org 27 Oct '05

27 Oct '05

Author: martin.v.loewis Date: Thu Oct 27 12:21:29 2005 New Revision: 41337 Modified: peps/trunk/pep-0347.txt Log: Correct svn+ssh URL. Modified: peps/trunk/pep-0347.txt ============================================================================== --- peps/trunk/pep-0347.txt (original) +++ peps/trunk/pep-0347.txt Thu Oct 27 12:21:29 2005 @@ -213,7 +213,7 @@ The repository should be published at http://svn.python.org/projects. Read-write access should be granted to all current SF committers -through svn+ssh://pythondev@svn.python.org/projects; +through svn+ssh://pythondev@svn.python.org/; read-only anonymous access through WebDAV should also be granted.

1 0

python/dist/src/Tools/unicode Makefile,NONE,1.1
by lemburg＠users.sourceforge.net 25 Oct '05

25 Oct '05

Update of /cvsroot/python/python/dist/src/Tools/unicode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27707 Added Files: Makefile Log Message: Add Makefile which allows easily rebuilding the charmap codecs. --- NEW FILE: Makefile --- # # Recreate the Python charmap codecs from the Unicode mapping # files available at ftp://ftp.unicode.org/ # #(c) Copyright Marc-Andre Lemburg, 2005. # Licensed to PSF under a Contributor Agreement. # Python binary to use PYTHON = python # Remove tool to use RM = /bin/rm ### Generic targets all: distclean mappings codecs codecs: misc windows iso apple ebcdic custom-mappings ### Mappings mappings: ncftpget -R ftp.unicode.org . Public/MAPPINGS ### Codecs build/: mkdir build misc: build/ $(PYTHON) gencodec.py MAPPINGS/VENDORS/MISC/ build/ $(RM) build/atarist.* $(RM) build/us_ascii_quotes.* $(RM) build/ibmgraph.* $(RM) build/sgml.* $(RM) -f build/readme.* custom-mappings: build/ $(PYTHON) gencodec.py python-mappings/ build/ windows: build/ $(PYTHON) gencodec.py MAPPINGS/VENDORS/MICSFT/WINDOWS/ build/ $(RM) build/cp9* $(RM) -f build/readme.* iso: build/ $(PYTHON) gencodec.py MAPPINGS/ISO8859/ build/iso $(RM) -f build/isoreadme.* apple: build/ $(PYTHON) gencodec.py MAPPINGS/VENDORS/APPLE/ build/mac_ $(RM) build/mac_dingbats.* $(RM) build/mac_japanese.* $(RM) build/mac_chin* $(RM) build/mac_korean.* $(RM) build/mac_symbol.* $(RM) build/mac_corpchar.* $(RM) build/mac_devanaga.* $(RM) build/mac_gaelic.* $(RM) build/mac_gurmukhi.* $(RM) build/mac_hebrew.* $(RM) build/mac_inuit.* $(RM) build/mac_thai.* $(RM) build/mac_ukraine.* $(RM) build/mac_arabic.py $(RM) build/mac_celtic.* $(RM) build/mac_gujarati.* $(RM) build/mac_keyboard.* $(RM) -f build/mac_readme.* ebcdic: build/ $(PYTHON) gencodec.py MAPPINGS/VENDORS/MICSFT/EBCDIC/ build/ $(RM) -f build/readme.* ### Cleanup clean: $(RM) build/* distclean: clean $(RM) -rf MAPPINGS/

1 0

python/dist/src/Tools/unicode/python-mappings CP1140.TXT, NONE, 1.1 KOI8-U.TXT, NONE, 1.1 TIS-620.TXT, NONE, 1.1
by lemburg＠users.sourceforge.net 25 Oct '05

25 Oct '05

Update of /cvsroot/python/python/dist/src/Tools/unicode/python-mappings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27571/python-mappings Added Files: CP1140.TXT KOI8-U.TXT TIS-620.TXT Log Message: Add custom mapping files used for generating some of the charmap codecs. --- NEW FILE: CP1140.TXT --- # # Name: CP1140 # Unicode version: 3.2 # Table version: 1.0 # Table format: Format A # Date: 2005-10-25 # Authors: Marc-Andre Lemburg <mal(a)egenix.com> # # This encoding is a modified CP037 encoding (with added Euro # currency sign). # # (c) Copyright Marc-Andre Lemburg, 2005. # Licensed to PSF under a Contributor Agreement. # # Based on the file # ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/EBCDIC/CP037.TXT # which is: # # Copyright (c) 2002 Unicode, Inc. All Rights reserved. # # This file is provided as-is by Unicode, Inc. (The Unicode Consortium). # No claims are made as to fitness for any particular purpose. No # warranties of any kind are expressed or implied. The recipient # agrees to determine applicability of information provided. If this # file has been provided on optical media by Unicode, Inc., the sole # remedy for any claim will be exchange of defective media within 90 # days of receipt. # # Unicode, Inc. hereby grants the right to freely use the information # supplied in this file in the creation of products supporting the # Unicode Standard, and to make copies of this file in any form for # internal or external distribution as long as this notice remains # attached. # 0x00 0x0000 #NULL 0x01 0x0001 #START OF HEADING 0x02 0x0002 #START OF TEXT 0x03 0x0003 #END OF TEXT 0x04 0x009C #CONTROL 0x05 0x0009 #HORIZONTAL TABULATION 0x06 0x0086 #CONTROL 0x07 0x007F #DELETE 0x08 0x0097 #CONTROL 0x09 0x008D #CONTROL 0x0A 0x008E #CONTROL 0x0B 0x000B #VERTICAL TABULATION 0x0C 0x000C #FORM FEED 0x0D 0x000D #CARRIAGE RETURN 0x0E 0x000E #SHIFT OUT 0x0F 0x000F #SHIFT IN 0x10 0x0010 #DATA LINK ESCAPE 0x11 0x0011 #DEVICE CONTROL ONE 0x12 0x0012 #DEVICE CONTROL TWO 0x13 0x0013 #DEVICE CONTROL THREE 0x14 0x009D #CONTROL 0x15 0x0085 #CONTROL 0x16 0x0008 #BACKSPACE 0x17 0x0087 #CONTROL 0x18 0x0018 #CANCEL 0x19 0x0019 #END OF MEDIUM 0x1A 0x0092 #CONTROL 0x1B 0x008F #CONTROL 0x1C 0x001C #FILE SEPARATOR 0x1D 0x001D #GROUP SEPARATOR 0x1E 0x001E #RECORD SEPARATOR 0x1F 0x001F #UNIT SEPARATOR 0x20 0x0080 #CONTROL 0x21 0x0081 #CONTROL 0x22 0x0082 #CONTROL 0x23 0x0083 #CONTROL 0x24 0x0084 #CONTROL 0x25 0x000A #LINE FEED 0x26 0x0017 #END OF TRANSMISSION BLOCK 0x27 0x001B #ESCAPE 0x28 0x0088 #CONTROL 0x29 0x0089 #CONTROL 0x2A 0x008A #CONTROL 0x2B 0x008B #CONTROL 0x2C 0x008C #CONTROL 0x2D 0x0005 #ENQUIRY 0x2E 0x0006 #ACKNOWLEDGE 0x2F 0x0007 #BELL 0x30 0x0090 #CONTROL 0x31 0x0091 #CONTROL 0x32 0x0016 #SYNCHRONOUS IDLE 0x33 0x0093 #CONTROL 0x34 0x0094 #CONTROL 0x35 0x0095 #CONTROL 0x36 0x0096 #CONTROL 0x37 0x0004 #END OF TRANSMISSION 0x38 0x0098 #CONTROL 0x39 0x0099 #CONTROL 0x3A 0x009A #CONTROL 0x3B 0x009B #CONTROL 0x3C 0x0014 #DEVICE CONTROL FOUR 0x3D 0x0015 #NEGATIVE ACKNOWLEDGE 0x3E 0x009E #CONTROL 0x3F 0x001A #SUBSTITUTE 0x40 0x0020 #SPACE 0x41 0x00A0 #NO-BREAK SPACE 0x42 0x00E2 #LATIN SMALL LETTER A WITH CIRCUMFLEX 0x43 0x00E4 #LATIN SMALL LETTER A WITH DIAERESIS 0x44 0x00E0 #LATIN SMALL LETTER A WITH GRAVE 0x45 0x00E1 #LATIN SMALL LETTER A WITH ACUTE 0x46 0x00E3 #LATIN SMALL LETTER A WITH TILDE 0x47 0x00E5 #LATIN SMALL LETTER A WITH RING ABOVE 0x48 0x00E7 #LATIN SMALL LETTER C WITH CEDILLA 0x49 0x00F1 #LATIN SMALL LETTER N WITH TILDE 0x4A 0x00A2 #CENT SIGN 0x4B 0x002E #FULL STOP 0x4C 0x003C #LESS-THAN SIGN 0x4D 0x0028 #LEFT PARENTHESIS 0x4E 0x002B #PLUS SIGN 0x4F 0x007C #VERTICAL LINE 0x50 0x0026 #AMPERSAND 0x51 0x00E9 #LATIN SMALL LETTER E WITH ACUTE 0x52 0x00EA #LATIN SMALL LETTER E WITH CIRCUMFLEX 0x53 0x00EB #LATIN SMALL LETTER E WITH DIAERESIS 0x54 0x00E8 #LATIN SMALL LETTER E WITH GRAVE 0x55 0x00ED #LATIN SMALL LETTER I WITH ACUTE 0x56 0x00EE #LATIN SMALL LETTER I WITH CIRCUMFLEX 0x57 0x00EF #LATIN SMALL LETTER I WITH DIAERESIS 0x58 0x00EC #LATIN SMALL LETTER I WITH GRAVE 0x59 0x00DF #LATIN SMALL LETTER SHARP S (GERMAN) 0x5A 0x0021 #EXCLAMATION MARK 0x5B 0x0024 #DOLLAR SIGN 0x5C 0x002A #ASTERISK 0x5D 0x0029 #RIGHT PARENTHESIS 0x5E 0x003B #SEMICOLON 0x5F 0x00AC #NOT SIGN 0x60 0x002D #HYPHEN-MINUS 0x61 0x002F #SOLIDUS 0x62 0x00C2 #LATIN CAPITAL LETTER A WITH CIRCUMFLEX 0x63 0x00C4 #LATIN CAPITAL LETTER A WITH DIAERESIS 0x64 0x00C0 #LATIN CAPITAL LETTER A WITH GRAVE 0x65 0x00C1 #LATIN CAPITAL LETTER A WITH ACUTE 0x66 0x00C3 #LATIN CAPITAL LETTER A WITH TILDE 0x67 0x00C5 #LATIN CAPITAL LETTER A WITH RING ABOVE 0x68 0x00C7 #LATIN CAPITAL LETTER C WITH CEDILLA 0x69 0x00D1 #LATIN CAPITAL LETTER N WITH TILDE 0x6A 0x00A6 #BROKEN BAR 0x6B 0x002C #COMMA 0x6C 0x0025 #PERCENT SIGN 0x6D 0x005F #LOW LINE 0x6E 0x003E #GREATER-THAN SIGN 0x6F 0x003F #QUESTION MARK 0x70 0x00F8 #LATIN SMALL LETTER O WITH STROKE 0x71 0x00C9 #LATIN CAPITAL LETTER E WITH ACUTE 0x72 0x00CA #LATIN CAPITAL LETTER E WITH CIRCUMFLEX 0x73 0x00CB #LATIN CAPITAL LETTER E WITH DIAERESIS 0x74 0x00C8 #LATIN CAPITAL LETTER E WITH GRAVE 0x75 0x00CD #LATIN CAPITAL LETTER I WITH ACUTE 0x76 0x00CE #LATIN CAPITAL LETTER I WITH CIRCUMFLEX 0x77 0x00CF #LATIN CAPITAL LETTER I WITH DIAERESIS 0x78 0x00CC #LATIN CAPITAL LETTER I WITH GRAVE 0x79 0x0060 #GRAVE ACCENT 0x7A 0x003A #COLON 0x7B 0x0023 #NUMBER SIGN 0x7C 0x0040 #COMMERCIAL AT 0x7D 0x0027 #APOSTROPHE 0x7E 0x003D #EQUALS SIGN 0x7F 0x0022 #QUOTATION MARK 0x80 0x00D8 #LATIN CAPITAL LETTER O WITH STROKE 0x81 0x0061 #LATIN SMALL LETTER A 0x82 0x0062 #LATIN SMALL LETTER B 0x83 0x0063 #LATIN SMALL LETTER C 0x84 0x0064 #LATIN SMALL LETTER D 0x85 0x0065 #LATIN SMALL LETTER E 0x86 0x0066 #LATIN SMALL LETTER F 0x87 0x0067 #LATIN SMALL LETTER G 0x88 0x0068 #LATIN SMALL LETTER H 0x89 0x0069 #LATIN SMALL LETTER I 0x8A 0x00AB #LEFT-POINTING DOUBLE ANGLE QUOTATION MARK 0x8B 0x00BB #RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK 0x8C 0x00F0 #LATIN SMALL LETTER ETH (ICELANDIC) 0x8D 0x00FD #LATIN SMALL LETTER Y WITH ACUTE 0x8E 0x00FE #LATIN SMALL LETTER THORN (ICELANDIC) 0x8F 0x00B1 #PLUS-MINUS SIGN 0x90 0x00B0 #DEGREE SIGN 0x91 0x006A #LATIN SMALL LETTER J 0x92 0x006B #LATIN SMALL LETTER K 0x93 0x006C #LATIN SMALL LETTER L 0x94 0x006D #LATIN SMALL LETTER M 0x95 0x006E #LATIN SMALL LETTER N 0x96 0x006F #LATIN SMALL LETTER O 0x97 0x0070 #LATIN SMALL LETTER P 0x98 0x0071 #LATIN SMALL LETTER Q 0x99 0x0072 #LATIN SMALL LETTER R 0x9A 0x00AA #FEMININE ORDINAL INDICATOR 0x9B 0x00BA #MASCULINE ORDINAL INDICATOR 0x9C 0x00E6 #LATIN SMALL LIGATURE AE 0x9D 0x00B8 #CEDILLA 0x9E 0x00C6 #LATIN CAPITAL LIGATURE AE #0x9F 0x00A4 #CURRENCY SIGN 0x9F 0x20AC # EURO SIGN 0xA0 0x00B5 #MICRO SIGN 0xA1 0x007E #TILDE 0xA2 0x0073 #LATIN SMALL LETTER S 0xA3 0x0074 #LATIN SMALL LETTER T 0xA4 0x0075 #LATIN SMALL LETTER U 0xA5 0x0076 #LATIN SMALL LETTER V 0xA6 0x0077 #LATIN SMALL LETTER W 0xA7 0x0078 #LATIN SMALL LETTER X 0xA8 0x0079 #LATIN SMALL LETTER Y 0xA9 0x007A #LATIN SMALL LETTER Z 0xAA 0x00A1 #INVERTED EXCLAMATION MARK 0xAB 0x00BF #INVERTED QUESTION MARK 0xAC 0x00D0 #LATIN CAPITAL LETTER ETH (ICELANDIC) 0xAD 0x00DD #LATIN CAPITAL LETTER Y WITH ACUTE 0xAE 0x00DE #LATIN CAPITAL LETTER THORN (ICELANDIC) 0xAF 0x00AE #REGISTERED SIGN 0xB0 0x005E #CIRCUMFLEX ACCENT 0xB1 0x00A3 #POUND SIGN 0xB2 0x00A5 #YEN SIGN 0xB3 0x00B7 #MIDDLE DOT 0xB4 0x00A9 #COPYRIGHT SIGN 0xB5 0x00A7 #SECTION SIGN 0xB6 0x00B6 #PILCROW SIGN 0xB7 0x00BC #VULGAR FRACTION ONE QUARTER 0xB8 0x00BD #VULGAR FRACTION ONE HALF 0xB9 0x00BE #VULGAR FRACTION THREE QUARTERS 0xBA 0x005B #LEFT SQUARE BRACKET 0xBB 0x005D #RIGHT SQUARE BRACKET 0xBC 0x00AF #MACRON 0xBD 0x00A8 #DIAERESIS 0xBE 0x00B4 #ACUTE ACCENT 0xBF 0x00D7 #MULTIPLICATION SIGN 0xC0 0x007B #LEFT CURLY BRACKET 0xC1 0x0041 #LATIN CAPITAL LETTER A 0xC2 0x0042 #LATIN CAPITAL LETTER B 0xC3 0x0043 #LATIN CAPITAL LETTER C 0xC4 0x0044 #LATIN CAPITAL LETTER D 0xC5 0x0045 #LATIN CAPITAL LETTER E 0xC6 0x0046 #LATIN CAPITAL LETTER F 0xC7 0x0047 #LATIN CAPITAL LETTER G 0xC8 0x0048 #LATIN CAPITAL LETTER H 0xC9 0x0049 #LATIN CAPITAL LETTER I 0xCA 0x00AD #SOFT HYPHEN 0xCB 0x00F4 #LATIN SMALL LETTER O WITH CIRCUMFLEX 0xCC 0x00F6 #LATIN SMALL LETTER O WITH DIAERESIS 0xCD 0x00F2 #LATIN SMALL LETTER O WITH GRAVE 0xCE 0x00F3 #LATIN SMALL LETTER O WITH ACUTE 0xCF 0x00F5 #LATIN SMALL LETTER O WITH TILDE 0xD0 0x007D #RIGHT CURLY BRACKET 0xD1 0x004A #LATIN CAPITAL LETTER J 0xD2 0x004B #LATIN CAPITAL LETTER K 0xD3 0x004C #LATIN CAPITAL LETTER L 0xD4 0x004D #LATIN CAPITAL LETTER M 0xD5 0x004E #LATIN CAPITAL LETTER N 0xD6 0x004F #LATIN CAPITAL LETTER O 0xD7 0x0050 #LATIN CAPITAL LETTER P 0xD8 0x0051 #LATIN CAPITAL LETTER Q 0xD9 0x0052 #LATIN CAPITAL LETTER R 0xDA 0x00B9 #SUPERSCRIPT ONE 0xDB 0x00FB #LATIN SMALL LETTER U WITH CIRCUMFLEX 0xDC 0x00FC #LATIN SMALL LETTER U WITH DIAERESIS 0xDD 0x00F9 #LATIN SMALL LETTER U WITH GRAVE 0xDE 0x00FA #LATIN SMALL LETTER U WITH ACUTE 0xDF 0x00FF #LATIN SMALL LETTER Y WITH DIAERESIS 0xE0 0x005C #REVERSE SOLIDUS 0xE1 0x00F7 #DIVISION SIGN 0xE2 0x0053 #LATIN CAPITAL LETTER S 0xE3 0x0054 #LATIN CAPITAL LETTER T 0xE4 0x0055 #LATIN CAPITAL LETTER U 0xE5 0x0056 #LATIN CAPITAL LETTER V 0xE6 0x0057 #LATIN CAPITAL LETTER W 0xE7 0x0058 #LATIN CAPITAL LETTER X 0xE8 0x0059 #LATIN CAPITAL LETTER Y 0xE9 0x005A #LATIN CAPITAL LETTER Z 0xEA 0x00B2 #SUPERSCRIPT TWO 0xEB 0x00D4 #LATIN CAPITAL LETTER O WITH CIRCUMFLEX 0xEC 0x00D6 #LATIN CAPITAL LETTER O WITH DIAERESIS 0xED 0x00D2 #LATIN CAPITAL LETTER O WITH GRAVE 0xEE 0x00D3 #LATIN CAPITAL LETTER O WITH ACUTE 0xEF 0x00D5 #LATIN CAPITAL LETTER O WITH TILDE 0xF0 0x0030 #DIGIT ZERO 0xF1 0x0031 #DIGIT ONE 0xF2 0x0032 #DIGIT TWO 0xF3 0x0033 #DIGIT THREE 0xF4 0x0034 #DIGIT FOUR 0xF5 0x0035 #DIGIT FIVE 0xF6 0x0036 #DIGIT SIX 0xF7 0x0037 #DIGIT SEVEN 0xF8 0x0038 #DIGIT EIGHT 0xF9 0x0039 #DIGIT NINE 0xFA 0x00B3 #SUPERSCRIPT THREE 0xFB 0x00DB #LATIN CAPITAL LETTER U WITH CIRCUMFLEX 0xFC 0x00DC #LATIN CAPITAL LETTER U WITH DIAERESIS 0xFD 0x00D9 #LATIN CAPITAL LETTER U WITH GRAVE 0xFE 0x00DA #LATIN CAPITAL LETTER U WITH ACUTE 0xFF 0x009F #CONTROL --- NEW FILE: KOI8-U.TXT --- # # Name: KOI8-U (RFC2319) to Unicode # Unicode version: 3.2 # Table version: 1.0 # Table format: Format A # Date: 2005-10-25 # Authors: Marc-Andre Lemburg <mal(a)egenix.com> # # See RFC2319 for details. This encoding is a modified KOI8-R # encoding. # # (c) Copyright Marc-Andre Lemburg, 2005. # Licensed to PSF under a Contributor Agreement. # # Based on the file # ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT # which is: # # Copyright (c) 1991-1999 Unicode, Inc. All Rights reserved. # # This file is provided as-is by Unicode, Inc. (The Unicode Consortium). # No claims are made as to fitness for any particular purpose. No # warranties of any kind are expressed or implied. The recipient # agrees to determine applicability of information provided. If this # file has been provided on optical media by Unicode, Inc., the sole # remedy for any claim will be exchange of defective media within 90 # days of receipt. # # Unicode, Inc. hereby grants the right to freely use the information # supplied in this file in the creation of products supporting the # Unicode Standard, and to make copies of this file in any form for # internal or external distribution as long as this notice remains # attached. # 0x00 0x0000 # NULL 0x01 0x0001 # START OF HEADING 0x02 0x0002 # START OF TEXT 0x03 0x0003 # END OF TEXT 0x04 0x0004 # END OF TRANSMISSION 0x05 0x0005 # ENQUIRY 0x06 0x0006 # ACKNOWLEDGE 0x07 0x0007 # BELL 0x08 0x0008 # BACKSPACE 0x09 0x0009 # HORIZONTAL TABULATION 0x0A 0x000A # LINE FEED 0x0B 0x000B # VERTICAL TABULATION 0x0C 0x000C # FORM FEED 0x0D 0x000D # CARRIAGE RETURN 0x0E 0x000E # SHIFT OUT 0x0F 0x000F # SHIFT IN 0x10 0x0010 # DATA LINK ESCAPE 0x11 0x0011 # DEVICE CONTROL ONE 0x12 0x0012 # DEVICE CONTROL TWO 0x13 0x0013 # DEVICE CONTROL THREE 0x14 0x0014 # DEVICE CONTROL FOUR 0x15 0x0015 # NEGATIVE ACKNOWLEDGE 0x16 0x0016 # SYNCHRONOUS IDLE 0x17 0x0017 # END OF TRANSMISSION BLOCK 0x18 0x0018 # CANCEL 0x19 0x0019 # END OF MEDIUM 0x1A 0x001A # SUBSTITUTE 0x1B 0x001B # ESCAPE 0x1C 0x001C # FILE SEPARATOR 0x1D 0x001D # GROUP SEPARATOR 0x1E 0x001E # RECORD SEPARATOR 0x1F 0x001F # UNIT SEPARATOR 0x20 0x0020 # SPACE 0x21 0x0021 # EXCLAMATION MARK 0x22 0x0022 # QUOTATION MARK 0x23 0x0023 # NUMBER SIGN 0x24 0x0024 # DOLLAR SIGN 0x25 0x0025 # PERCENT SIGN 0x26 0x0026 # AMPERSAND 0x27 0x0027 # APOSTROPHE 0x28 0x0028 # LEFT PARENTHESIS 0x29 0x0029 # RIGHT PARENTHESIS 0x2A 0x002A # ASTERISK 0x2B 0x002B # PLUS SIGN 0x2C 0x002C # COMMA 0x2D 0x002D # HYPHEN-MINUS 0x2E 0x002E # FULL STOP 0x2F 0x002F # SOLIDUS 0x30 0x0030 # DIGIT ZERO 0x31 0x0031 # DIGIT ONE 0x32 0x0032 # DIGIT TWO 0x33 0x0033 # DIGIT THREE 0x34 0x0034 # DIGIT FOUR 0x35 0x0035 # DIGIT FIVE 0x36 0x0036 # DIGIT SIX 0x37 0x0037 # DIGIT SEVEN 0x38 0x0038 # DIGIT EIGHT 0x39 0x0039 # DIGIT NINE 0x3A 0x003A # COLON 0x3B 0x003B # SEMICOLON 0x3C 0x003C # LESS-THAN SIGN 0x3D 0x003D # EQUALS SIGN 0x3E 0x003E # GREATER-THAN SIGN 0x3F 0x003F # QUESTION MARK 0x40 0x0040 # COMMERCIAL AT 0x41 0x0041 # LATIN CAPITAL LETTER A 0x42 0x0042 # LATIN CAPITAL LETTER B 0x43 0x0043 # LATIN CAPITAL LETTER C 0x44 0x0044 # LATIN CAPITAL LETTER D 0x45 0x0045 # LATIN CAPITAL LETTER E 0x46 0x0046 # LATIN CAPITAL LETTER F 0x47 0x0047 # LATIN CAPITAL LETTER G 0x48 0x0048 # LATIN CAPITAL LETTER H 0x49 0x0049 # LATIN CAPITAL LETTER I 0x4A 0x004A # LATIN CAPITAL LETTER J 0x4B 0x004B # LATIN CAPITAL LETTER K 0x4C 0x004C # LATIN CAPITAL LETTER L 0x4D 0x004D # LATIN CAPITAL LETTER M 0x4E 0x004E # LATIN CAPITAL LETTER N 0x4F 0x004F # LATIN CAPITAL LETTER O 0x50 0x0050 # LATIN CAPITAL LETTER P 0x51 0x0051 # LATIN CAPITAL LETTER Q 0x52 0x0052 # LATIN CAPITAL LETTER R 0x53 0x0053 # LATIN CAPITAL LETTER S 0x54 0x0054 # LATIN CAPITAL LETTER T 0x55 0x0055 # LATIN CAPITAL LETTER U 0x56 0x0056 # LATIN CAPITAL LETTER V 0x57 0x0057 # LATIN CAPITAL LETTER W 0x58 0x0058 # LATIN CAPITAL LETTER X 0x59 0x0059 # LATIN CAPITAL LETTER Y 0x5A 0x005A # LATIN CAPITAL LETTER Z 0x5B 0x005B # LEFT SQUARE BRACKET 0x5C 0x005C # REVERSE SOLIDUS 0x5D 0x005D # RIGHT SQUARE BRACKET 0x5E 0x005E # CIRCUMFLEX ACCENT 0x5F 0x005F # LOW LINE 0x60 0x0060 # GRAVE ACCENT 0x61 0x0061 # LATIN SMALL LETTER A 0x62 0x0062 # LATIN SMALL LETTER B 0x63 0x0063 # LATIN SMALL LETTER C 0x64 0x0064 # LATIN SMALL LETTER D 0x65 0x0065 # LATIN SMALL LETTER E 0x66 0x0066 # LATIN SMALL LETTER F 0x67 0x0067 # LATIN SMALL LETTER G 0x68 0x0068 # LATIN SMALL LETTER H 0x69 0x0069 # LATIN SMALL LETTER I 0x6A 0x006A # LATIN SMALL LETTER J 0x6B 0x006B # LATIN SMALL LETTER K 0x6C 0x006C # LATIN SMALL LETTER L 0x6D 0x006D # LATIN SMALL LETTER M 0x6E 0x006E # LATIN SMALL LETTER N 0x6F 0x006F # LATIN SMALL LETTER O 0x70 0x0070 # LATIN SMALL LETTER P 0x71 0x0071 # LATIN SMALL LETTER Q 0x72 0x0072 # LATIN SMALL LETTER R 0x73 0x0073 # LATIN SMALL LETTER S 0x74 0x0074 # LATIN SMALL LETTER T 0x75 0x0075 # LATIN SMALL LETTER U 0x76 0x0076 # LATIN SMALL LETTER V 0x77 0x0077 # LATIN SMALL LETTER W 0x78 0x0078 # LATIN SMALL LETTER X 0x79 0x0079 # LATIN SMALL LETTER Y 0x7A 0x007A # LATIN SMALL LETTER Z 0x7B 0x007B # LEFT CURLY BRACKET 0x7C 0x007C # VERTICAL LINE 0x7D 0x007D # RIGHT CURLY BRACKET 0x7E 0x007E # TILDE 0x7F 0x007F # DELETE 0x80 0x2500 # BOX DRAWINGS LIGHT HORIZONTAL 0x81 0x2502 # BOX DRAWINGS LIGHT VERTICAL 0x82 0x250C # BOX DRAWINGS LIGHT DOWN AND RIGHT 0x83 0x2510 # BOX DRAWINGS LIGHT DOWN AND LEFT 0x84 0x2514 # BOX DRAWINGS LIGHT UP AND RIGHT 0x85 0x2518 # BOX DRAWINGS LIGHT UP AND LEFT 0x86 0x251C # BOX DRAWINGS LIGHT VERTICAL AND RIGHT 0x87 0x2524 # BOX DRAWINGS LIGHT VERTICAL AND LEFT 0x88 0x252C # BOX DRAWINGS LIGHT DOWN AND HORIZONTAL 0x89 0x2534 # BOX DRAWINGS LIGHT UP AND HORIZONTAL 0x8A 0x253C # BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL 0x8B 0x2580 # UPPER HALF BLOCK 0x8C 0x2584 # LOWER HALF BLOCK 0x8D 0x2588 # FULL BLOCK 0x8E 0x258C # LEFT HALF BLOCK 0x8F 0x2590 # RIGHT HALF BLOCK 0x90 0x2591 # LIGHT SHADE 0x91 0x2592 # MEDIUM SHADE 0x92 0x2593 # DARK SHADE 0x93 0x2320 # TOP HALF INTEGRAL 0x94 0x25A0 # BLACK SQUARE 0x95 0x2219 # BULLET OPERATOR 0x96 0x221A # SQUARE ROOT 0x97 0x2248 # ALMOST EQUAL TO 0x98 0x2264 # LESS-THAN OR EQUAL TO 0x99 0x2265 # GREATER-THAN OR EQUAL TO 0x9A 0x00A0 # NO-BREAK SPACE 0x9B 0x2321 # BOTTOM HALF INTEGRAL 0x9C 0x00B0 # DEGREE SIGN 0x9D 0x00B2 # SUPERSCRIPT TWO 0x9E 0x00B7 # MIDDLE DOT 0x9F 0x00F7 # DIVISION SIGN 0xA0 0x2550 # BOX DRAWINGS DOUBLE HORIZONTAL 0xA1 0x2551 # BOX DRAWINGS DOUBLE VERTICAL 0xA2 0x2552 # BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE 0xA3 0x0451 # CYRILLIC SMALL LETTER IO #0xA4 0x2553 # BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE 0xA4 0x0454 # CYRILLIC SMALL LETTER UKRAINIAN IE 0xA5 0x2554 # BOX DRAWINGS DOUBLE DOWN AND RIGHT #0xA6 0x2555 # BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE 0xA6 0x0456 # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I #0xA7 0x2556 # BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE 0xA7 0x0457 # CYRILLIC SMALL LETTER YI (UKRAINIAN) 0xA8 0x2557 # BOX DRAWINGS DOUBLE DOWN AND LEFT 0xA9 0x2558 # BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE 0xAA 0x2559 # BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE 0xAB 0x255A # BOX DRAWINGS DOUBLE UP AND RIGHT 0xAC 0x255B # BOX DRAWINGS UP SINGLE AND LEFT DOUBLE #0xAD 0x255C # BOX DRAWINGS UP DOUBLE AND LEFT SINGLE 0xAD 0x0491 # CYRILLIC SMALL LETTER UKRAINIAN GHE WITH UPTURN 0xAE 0x255D # BOX DRAWINGS DOUBLE UP AND LEFT 0xAF 0x255E # BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE 0xB0 0x255F # BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE 0xB1 0x2560 # BOX DRAWINGS DOUBLE VERTICAL AND RIGHT 0xB2 0x2561 # BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE 0xB3 0x0401 # CYRILLIC CAPITAL LETTER IO #0xB4 0x2562 # BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE 0xB4 0x0404 # CYRILLIC CAPITAL LETTER UKRAINIAN IE 0xB5 0x2563 # BOX DRAWINGS DOUBLE VERTICAL AND LEFT #0xB6 0x2564 # BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE 0xB6 0x0406 # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I #0xB7 0x2565 # BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE 0xB7 0x0407 # CYRILLIC CAPITAL LETTER YI (UKRAINIAN) 0xB8 0x2566 # BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL 0xB9 0x2567 # BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE 0xBA 0x2568 # BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE 0xBB 0x2569 # BOX DRAWINGS DOUBLE UP AND HORIZONTAL 0xBC 0x256A # BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE #0xBD 0x256B # BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE 0xBD 0x0490 # CYRILLIC CAPITAL LETTER UKRAINIAN GHE WITH UPTURN 0xBE 0x256C # BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL 0xBF 0x00A9 # COPYRIGHT SIGN 0xC0 0x044E # CYRILLIC SMALL LETTER YU 0xC1 0x0430 # CYRILLIC SMALL LETTER A 0xC2 0x0431 # CYRILLIC SMALL LETTER BE 0xC3 0x0446 # CYRILLIC SMALL LETTER TSE 0xC4 0x0434 # CYRILLIC SMALL LETTER DE 0xC5 0x0435 # CYRILLIC SMALL LETTER IE 0xC6 0x0444 # CYRILLIC SMALL LETTER EF 0xC7 0x0433 # CYRILLIC SMALL LETTER GHE 0xC8 0x0445 # CYRILLIC SMALL LETTER HA 0xC9 0x0438 # CYRILLIC SMALL LETTER I 0xCA 0x0439 # CYRILLIC SMALL LETTER SHORT I 0xCB 0x043A # CYRILLIC SMALL LETTER KA 0xCC 0x043B # CYRILLIC SMALL LETTER EL 0xCD 0x043C # CYRILLIC SMALL LETTER EM 0xCE 0x043D # CYRILLIC SMALL LETTER EN 0xCF 0x043E # CYRILLIC SMALL LETTER O 0xD0 0x043F # CYRILLIC SMALL LETTER PE 0xD1 0x044F # CYRILLIC SMALL LETTER YA 0xD2 0x0440 # CYRILLIC SMALL LETTER ER 0xD3 0x0441 # CYRILLIC SMALL LETTER ES 0xD4 0x0442 # CYRILLIC SMALL LETTER TE 0xD5 0x0443 # CYRILLIC SMALL LETTER U 0xD6 0x0436 # CYRILLIC SMALL LETTER ZHE 0xD7 0x0432 # CYRILLIC SMALL LETTER VE 0xD8 0x044C # CYRILLIC SMALL LETTER SOFT SIGN 0xD9 0x044B # CYRILLIC SMALL LETTER YERU 0xDA 0x0437 # CYRILLIC SMALL LETTER ZE 0xDB 0x0448 # CYRILLIC SMALL LETTER SHA 0xDC 0x044D # CYRILLIC SMALL LETTER E 0xDD 0x0449 # CYRILLIC SMALL LETTER SHCHA 0xDE 0x0447 # CYRILLIC SMALL LETTER CHE 0xDF 0x044A # CYRILLIC SMALL LETTER HARD SIGN 0xE0 0x042E # CYRILLIC CAPITAL LETTER YU 0xE1 0x0410 # CYRILLIC CAPITAL LETTER A 0xE2 0x0411 # CYRILLIC CAPITAL LETTER BE 0xE3 0x0426 # CYRILLIC CAPITAL LETTER TSE 0xE4 0x0414 # CYRILLIC CAPITAL LETTER DE 0xE5 0x0415 # CYRILLIC CAPITAL LETTER IE 0xE6 0x0424 # CYRILLIC CAPITAL LETTER EF 0xE7 0x0413 # CYRILLIC CAPITAL LETTER GHE 0xE8 0x0425 # CYRILLIC CAPITAL LETTER HA 0xE9 0x0418 # CYRILLIC CAPITAL LETTER I 0xEA 0x0419 # CYRILLIC CAPITAL LETTER SHORT I 0xEB 0x041A # CYRILLIC CAPITAL LETTER KA 0xEC 0x041B # CYRILLIC CAPITAL LETTER EL 0xED 0x041C # CYRILLIC CAPITAL LETTER EM 0xEE 0x041D # CYRILLIC CAPITAL LETTER EN 0xEF 0x041E # CYRILLIC CAPITAL LETTER O 0xF0 0x041F # CYRILLIC CAPITAL LETTER PE 0xF1 0x042F # CYRILLIC CAPITAL LETTER YA 0xF2 0x0420 # CYRILLIC CAPITAL LETTER ER 0xF3 0x0421 # CYRILLIC CAPITAL LETTER ES 0xF4 0x0422 # CYRILLIC CAPITAL LETTER TE 0xF5 0x0423 # CYRILLIC CAPITAL LETTER U 0xF6 0x0416 # CYRILLIC CAPITAL LETTER ZHE 0xF7 0x0412 # CYRILLIC CAPITAL LETTER VE 0xF8 0x042C # CYRILLIC CAPITAL LETTER SOFT SIGN 0xF9 0x042B # CYRILLIC CAPITAL LETTER YERU 0xFA 0x0417 # CYRILLIC CAPITAL LETTER ZE 0xFB 0x0428 # CYRILLIC CAPITAL LETTER SHA 0xFC 0x042D # CYRILLIC CAPITAL LETTER E 0xFD 0x0429 # CYRILLIC CAPITAL LETTER SHCHA 0xFE 0x0427 # CYRILLIC CAPITAL LETTER CHE 0xFF 0x042A # CYRILLIC CAPITAL LETTER HARD SIGN --- NEW FILE: TIS-620.TXT --- # # Name: TIS-620 # Unicode version: 3.2 # Table version: 1.0 # Table format: Format A # Date: 2005-10-25 # Authors: Marc-Andre Lemburg <mal(a)egenix.com> # # According to # ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-11.TXT the # TIS-620 is the identical to ISO_8859-11 with the 0xA0 # (no-break space) mapping removed. # # (c) Copyright Marc-Andre Lemburg, 2005. # Licensed to PSF under a Contributor Agreement. # # Based on the file # ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-11.TXT # which is: # # Copyright (c) 2002 Unicode, Inc. All Rights reserved. # # This file is provided as-is by Unicode, Inc. (The Unicode Consortium). # No claims are made as to fitness for any particular purpose. No # warranties of any kind are expressed or implied. The recipient # agrees to determine applicability of information provided. If this # file has been provided on optical media by Unicode, Inc., the sole # remedy for any claim will be exchange of defective media within 90 # days of receipt. # # Unicode, Inc. hereby grants the right to freely use the information # supplied in this file in the creation of products supporting the # Unicode Standard, and to make copies of this file in any form for # internal or external distribution as long as this notice remains # attached. # 0x00 0x0000 # NULL 0x01 0x0001 # START OF HEADING 0x02 0x0002 # START OF TEXT 0x03 0x0003 # END OF TEXT 0x04 0x0004 # END OF TRANSMISSION 0x05 0x0005 # ENQUIRY 0x06 0x0006 # ACKNOWLEDGE 0x07 0x0007 # BELL 0x08 0x0008 # BACKSPACE 0x09 0x0009 # HORIZONTAL TABULATION 0x0A 0x000A # LINE FEED 0x0B 0x000B # VERTICAL TABULATION 0x0C 0x000C # FORM FEED 0x0D 0x000D # CARRIAGE RETURN 0x0E 0x000E # SHIFT OUT 0x0F 0x000F # SHIFT IN 0x10 0x0010 # DATA LINK ESCAPE 0x11 0x0011 # DEVICE CONTROL ONE 0x12 0x0012 # DEVICE CONTROL TWO 0x13 0x0013 # DEVICE CONTROL THREE 0x14 0x0014 # DEVICE CONTROL FOUR 0x15 0x0015 # NEGATIVE ACKNOWLEDGE 0x16 0x0016 # SYNCHRONOUS IDLE 0x17 0x0017 # END OF TRANSMISSION BLOCK 0x18 0x0018 # CANCEL 0x19 0x0019 # END OF MEDIUM 0x1A 0x001A # SUBSTITUTE 0x1B 0x001B # ESCAPE 0x1C 0x001C # FILE SEPARATOR 0x1D 0x001D # GROUP SEPARATOR 0x1E 0x001E # RECORD SEPARATOR 0x1F 0x001F # UNIT SEPARATOR 0x20 0x0020 # SPACE 0x21 0x0021 # EXCLAMATION MARK 0x22 0x0022 # QUOTATION MARK 0x23 0x0023 # NUMBER SIGN 0x24 0x0024 # DOLLAR SIGN 0x25 0x0025 # PERCENT SIGN 0x26 0x0026 # AMPERSAND 0x27 0x0027 # APOSTROPHE 0x28 0x0028 # LEFT PARENTHESIS 0x29 0x0029 # RIGHT PARENTHESIS 0x2A 0x002A # ASTERISK 0x2B 0x002B # PLUS SIGN 0x2C 0x002C # COMMA 0x2D 0x002D # HYPHEN-MINUS 0x2E 0x002E # FULL STOP 0x2F 0x002F # SOLIDUS 0x30 0x0030 # DIGIT ZERO 0x31 0x0031 # DIGIT ONE 0x32 0x0032 # DIGIT TWO 0x33 0x0033 # DIGIT THREE 0x34 0x0034 # DIGIT FOUR 0x35 0x0035 # DIGIT FIVE 0x36 0x0036 # DIGIT SIX 0x37 0x0037 # DIGIT SEVEN 0x38 0x0038 # DIGIT EIGHT 0x39 0x0039 # DIGIT NINE 0x3A 0x003A # COLON 0x3B 0x003B # SEMICOLON 0x3C 0x003C # LESS-THAN SIGN 0x3D 0x003D # EQUALS SIGN 0x3E 0x003E # GREATER-THAN SIGN 0x3F 0x003F # QUESTION MARK 0x40 0x0040 # COMMERCIAL AT 0x41 0x0041 # LATIN CAPITAL LETTER A 0x42 0x0042 # LATIN CAPITAL LETTER B 0x43 0x0043 # LATIN CAPITAL LETTER C 0x44 0x0044 # LATIN CAPITAL LETTER D 0x45 0x0045 # LATIN CAPITAL LETTER E 0x46 0x0046 # LATIN CAPITAL LETTER F 0x47 0x0047 # LATIN CAPITAL LETTER G 0x48 0x0048 # LATIN CAPITAL LETTER H 0x49 0x0049 # LATIN CAPITAL LETTER I 0x4A 0x004A # LATIN CAPITAL LETTER J 0x4B 0x004B # LATIN CAPITAL LETTER K 0x4C 0x004C # LATIN CAPITAL LETTER L 0x4D 0x004D # LATIN CAPITAL LETTER M 0x4E 0x004E # LATIN CAPITAL LETTER N 0x4F 0x004F # LATIN CAPITAL LETTER O 0x50 0x0050 # LATIN CAPITAL LETTER P 0x51 0x0051 # LATIN CAPITAL LETTER Q 0x52 0x0052 # LATIN CAPITAL LETTER R 0x53 0x0053 # LATIN CAPITAL LETTER S 0x54 0x0054 # LATIN CAPITAL LETTER T 0x55 0x0055 # LATIN CAPITAL LETTER U 0x56 0x0056 # LATIN CAPITAL LETTER V 0x57 0x0057 # LATIN CAPITAL LETTER W 0x58 0x0058 # LATIN CAPITAL LETTER X 0x59 0x0059 # LATIN CAPITAL LETTER Y 0x5A 0x005A # LATIN CAPITAL LETTER Z 0x5B 0x005B # LEFT SQUARE BRACKET 0x5C 0x005C # REVERSE SOLIDUS 0x5D 0x005D # RIGHT SQUARE BRACKET 0x5E 0x005E # CIRCUMFLEX ACCENT 0x5F 0x005F # LOW LINE 0x60 0x0060 # GRAVE ACCENT 0x61 0x0061 # LATIN SMALL LETTER A 0x62 0x0062 # LATIN SMALL LETTER B 0x63 0x0063 # LATIN SMALL LETTER C 0x64 0x0064 # LATIN SMALL LETTER D 0x65 0x0065 # LATIN SMALL LETTER E 0x66 0x0066 # LATIN SMALL LETTER F 0x67 0x0067 # LATIN SMALL LETTER G 0x68 0x0068 # LATIN SMALL LETTER H 0x69 0x0069 # LATIN SMALL LETTER I 0x6A 0x006A # LATIN SMALL LETTER J 0x6B 0x006B # LATIN SMALL LETTER K 0x6C 0x006C # LATIN SMALL LETTER L 0x6D 0x006D # LATIN SMALL LETTER M 0x6E 0x006E # LATIN SMALL LETTER N 0x6F 0x006F # LATIN SMALL LETTER O 0x70 0x0070 # LATIN SMALL LETTER P 0x71 0x0071 # LATIN SMALL LETTER Q 0x72 0x0072 # LATIN SMALL LETTER R 0x73 0x0073 # LATIN SMALL LETTER S 0x74 0x0074 # LATIN SMALL LETTER T 0x75 0x0075 # LATIN SMALL LETTER U 0x76 0x0076 # LATIN SMALL LETTER V 0x77 0x0077 # LATIN SMALL LETTER W 0x78 0x0078 # LATIN SMALL LETTER X 0x79 0x0079 # LATIN SMALL LETTER Y 0x7A 0x007A # LATIN SMALL LETTER Z 0x7B 0x007B # LEFT CURLY BRACKET 0x7C 0x007C # VERTICAL LINE 0x7D 0x007D # RIGHT CURLY BRACKET 0x7E 0x007E # TILDE 0x7F 0x007F # DELETE 0x80 0x0080 # <control> 0x81 0x0081 # <control> 0x82 0x0082 # <control> 0x83 0x0083 # <control> 0x84 0x0084 # <control> 0x85 0x0085 # <control> 0x86 0x0086 # <control> 0x87 0x0087 # <control> 0x88 0x0088 # <control> 0x89 0x0089 # <control> 0x8A 0x008A # <control> 0x8B 0x008B # <control> 0x8C 0x008C # <control> 0x8D 0x008D # <control> 0x8E 0x008E # <control> 0x8F 0x008F # <control> 0x90 0x0090 # <control> 0x91 0x0091 # <control> 0x92 0x0092 # <control> 0x93 0x0093 # <control> 0x94 0x0094 # <control> 0x95 0x0095 # <control> 0x96 0x0096 # <control> 0x97 0x0097 # <control> 0x98 0x0098 # <control> 0x99 0x0099 # <control> 0x9A 0x009A # <control> 0x9B 0x009B # <control> 0x9C 0x009C # <control> 0x9D 0x009D # <control> 0x9E 0x009E # <control> 0x9F 0x009F # <control> #0xA0 0x00A0 # NO-BREAK SPACE 0xA1 0x0E01 # THAI CHARACTER KO KAI 0xA2 0x0E02 # THAI CHARACTER KHO KHAI 0xA3 0x0E03 # THAI CHARACTER KHO KHUAT 0xA4 0x0E04 # THAI CHARACTER KHO KHWAI 0xA5 0x0E05 # THAI CHARACTER KHO KHON 0xA6 0x0E06 # THAI CHARACTER KHO RAKHANG 0xA7 0x0E07 # THAI CHARACTER NGO NGU 0xA8 0x0E08 # THAI CHARACTER CHO CHAN 0xA9 0x0E09 # THAI CHARACTER CHO CHING 0xAA 0x0E0A # THAI CHARACTER CHO CHANG 0xAB 0x0E0B # THAI CHARACTER SO SO 0xAC 0x0E0C # THAI CHARACTER CHO CHOE 0xAD 0x0E0D # THAI CHARACTER YO YING 0xAE 0x0E0E # THAI CHARACTER DO CHADA 0xAF 0x0E0F # THAI CHARACTER TO PATAK 0xB0 0x0E10 # THAI CHARACTER THO THAN 0xB1 0x0E11 # THAI CHARACTER THO NANGMONTHO 0xB2 0x0E12 # THAI CHARACTER THO PHUTHAO 0xB3 0x0E13 # THAI CHARACTER NO NEN 0xB4 0x0E14 # THAI CHARACTER DO DEK 0xB5 0x0E15 # THAI CHARACTER TO TAO 0xB6 0x0E16 # THAI CHARACTER THO THUNG 0xB7 0x0E17 # THAI CHARACTER THO THAHAN 0xB8 0x0E18 # THAI CHARACTER THO THONG 0xB9 0x0E19 # THAI CHARACTER NO NU 0xBA 0x0E1A # THAI CHARACTER BO BAIMAI 0xBB 0x0E1B # THAI CHARACTER PO PLA 0xBC 0x0E1C # THAI CHARACTER PHO PHUNG 0xBD 0x0E1D # THAI CHARACTER FO FA 0xBE 0x0E1E # THAI CHARACTER PHO PHAN 0xBF 0x0E1F # THAI CHARACTER FO FAN 0xC0 0x0E20 # THAI CHARACTER PHO SAMPHAO 0xC1 0x0E21 # THAI CHARACTER MO MA 0xC2 0x0E22 # THAI CHARACTER YO YAK 0xC3 0x0E23 # THAI CHARACTER RO RUA 0xC4 0x0E24 # THAI CHARACTER RU 0xC5 0x0E25 # THAI CHARACTER LO LING 0xC6 0x0E26 # THAI CHARACTER LU 0xC7 0x0E27 # THAI CHARACTER WO WAEN 0xC8 0x0E28 # THAI CHARACTER SO SALA 0xC9 0x0E29 # THAI CHARACTER SO RUSI 0xCA 0x0E2A # THAI CHARACTER SO SUA 0xCB 0x0E2B # THAI CHARACTER HO HIP 0xCC 0x0E2C # THAI CHARACTER LO CHULA 0xCD 0x0E2D # THAI CHARACTER O ANG 0xCE 0x0E2E # THAI CHARACTER HO NOKHUK 0xCF 0x0E2F # THAI CHARACTER PAIYANNOI 0xD0 0x0E30 # THAI CHARACTER SARA A 0xD1 0x0E31 # THAI CHARACTER MAI HAN-AKAT 0xD2 0x0E32 # THAI CHARACTER SARA AA 0xD3 0x0E33 # THAI CHARACTER SARA AM 0xD4 0x0E34 # THAI CHARACTER SARA I 0xD5 0x0E35 # THAI CHARACTER SARA II 0xD6 0x0E36 # THAI CHARACTER SARA UE 0xD7 0x0E37 # THAI CHARACTER SARA UEE 0xD8 0x0E38 # THAI CHARACTER SARA U 0xD9 0x0E39 # THAI CHARACTER SARA UU 0xDA 0x0E3A # THAI CHARACTER PHINTHU 0xDF 0x0E3F # THAI CURRENCY SYMBOL BAHT 0xE0 0x0E40 # THAI CHARACTER SARA E 0xE1 0x0E41 # THAI CHARACTER SARA AE 0xE2 0x0E42 # THAI CHARACTER SARA O 0xE3 0x0E43 # THAI CHARACTER SARA AI MAIMUAN 0xE4 0x0E44 # THAI CHARACTER SARA AI MAIMALAI 0xE5 0x0E45 # THAI CHARACTER LAKKHANGYAO 0xE6 0x0E46 # THAI CHARACTER MAIYAMOK 0xE7 0x0E47 # THAI CHARACTER MAITAIKHU 0xE8 0x0E48 # THAI CHARACTER MAI EK 0xE9 0x0E49 # THAI CHARACTER MAI THO 0xEA 0x0E4A # THAI CHARACTER MAI TRI 0xEB 0x0E4B # THAI CHARACTER MAI CHATTAWA 0xEC 0x0E4C # THAI CHARACTER THANTHAKHAT 0xED 0x0E4D # THAI CHARACTER NIKHAHIT 0xEE 0x0E4E # THAI CHARACTER YAMAKKAN 0xEF 0x0E4F # THAI CHARACTER FONGMAN 0xF0 0x0E50 # THAI DIGIT ZERO 0xF1 0x0E51 # THAI DIGIT ONE 0xF2 0x0E52 # THAI DIGIT TWO 0xF3 0x0E53 # THAI DIGIT THREE 0xF4 0x0E54 # THAI DIGIT FOUR 0xF5 0x0E55 # THAI DIGIT FIVE 0xF6 0x0E56 # THAI DIGIT SIX 0xF7 0x0E57 # THAI DIGIT SEVEN 0xF8 0x0E58 # THAI DIGIT EIGHT 0xF9 0x0E59 # THAI DIGIT NINE 0xFA 0x0E5A # THAI CHARACTER ANGKHANKHU 0xFB 0x0E5B # THAI CHARACTER KHOMUT

1 0

python/dist/src/Tools/unicode gencodec.py, 1.1, 1.2
by lemburg＠users.sourceforge.net 25 Oct '05

25 Oct '05

Update of /cvsroot/python/python/dist/src/Tools/unicode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27433 Modified Files: gencodec.py Log Message: Apply some cosmetic fixes to the output of the script. Only include the decoding map if no table can be generated. Index: gencodec.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/unicode/gencodec.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gencodec.py 21 Oct 2005 13:45:17 -0000 1.1 +++ gencodec.py 25 Oct 2005 11:53:33 -0000 1.2 @@ -15,12 +15,14 @@ The tool also writes marshalled versions of the mapping tables to the same location (with .mapping extension). -Written by Marc-Andre Lemburg (mal(a)lemburg.com). Modified to generate -Unicode table maps for decoding. +Written by Marc-Andre Lemburg (mal(a)lemburg.com). (c) Copyright CNRI, All Rights Reserved. NO WARRANTY. (c) Copyright Guido van Rossum, 2000. + +Table generation: (c) Copyright Marc-Andre Lemburg, 2005. + Licensed to PSF under a Contributor Agreement. """#" @@ -117,21 +119,22 @@ return enc2uni -def hexrepr(t): +def hexrepr(t, precision=4): if t is None: return 'None' try: len(t) except: - return '0x%04x' % t + return '0x%0*X' % (precision, t) try: - return '(' + ', '.join(map(lambda t: '0x%04x' % t, t)) + ')' + return '(' + ', '.join(['0x%0*X' % (precision, item) + for item in t]) + ')' except TypeError, why: print '* failed to convert %r: %s' % (t, why) raise -def python_mapdef_code(varname, map, comments=1): +def python_mapdef_code(varname, map, comments=1, precisions=(2, 4)): l = [] append = l.append @@ -150,6 +153,7 @@ mappings = map.items() mappings.sort() i = 0 + key_precision, value_precision = precisions for mapkey, mapvalue in mappings: mapcomment = '' if isinstance(mapkey, tuple): @@ -164,8 +168,8 @@ # No need to include identity mappings, since these # are already set for the first 256 code points. continue - key = hexrepr(mapkey) - value = hexrepr(mapvalue) + key = hexrepr(mapkey, key_precision) + value = hexrepr(mapvalue, value_precision) if mapcomment and comments: append(' %s: %s,\t# %s' % (key, value, mapcomment)) else: @@ -188,7 +192,7 @@ return l -def python_tabledef_code(varname, map, comments=1): +def python_tabledef_code(varname, map, comments=1, key_precision=2): l = [] append = l.append @@ -236,7 +240,7 @@ mapchar = unichr(mapvalue) if mapcomment and comments: append(' %r\t# %s -> %s' % (mapchar, - hexrepr(key), + hexrepr(key, key_precision), mapcomment)) else: append(' %r' % mapchar) @@ -263,7 +267,8 @@ encoding_map_code = python_mapdef_code( 'encoding_map', codecs.make_encoding_map(map), - comments=comments) + comments=comments, + precisions=(4, 2)) l = [ '''\ @@ -303,22 +308,28 @@ def getregentry(): return (Codec().encode,Codec().decode,StreamReader,StreamWriter) +''') + # Add decoding table or map (with preference to the table) + if not decoding_table_code: + l.append(''' ### Decoding Map ''') - l.extend(decoding_map_code) - - # Add optional decoding table - if decoding_table_code: + l.extend(decoding_map_code) + else: l.append(''' ### Decoding Table ''') l.extend(decoding_table_code) + # Add encoding map l.append(''' ### Encoding Map ''') l.extend(encoding_map_code) + + # Final new-line + l.append('\n') return '\n'.join(l) @@ -343,6 +354,8 @@ mapnames = os.listdir(dir) for mapname in mapnames: mappathname = os.path.join(dir, mapname) + if not os.path.isfile(mappathname): + continue name = os.path.split(mapname)[1] name = name.replace('-','_') name = name.split('.')[0]

1 0