• Thomas Wouters's avatar
    Merged revisions 53538-53622 via svnmerge from · 9fe394c1
    Thomas Wouters yazdı
    svn+ssh://pythondev@svn.python.org/python/trunk
    
    ........
      r53545 | andrew.kuchling | 2007-01-24 21:06:41 +0100 (Wed, 24 Jan 2007) | 1 line
    
      Strengthen warning about using lock()
    ........
      r53556 | thomas.heller | 2007-01-25 19:34:14 +0100 (Thu, 25 Jan 2007) | 3 lines
    
      Fix for #1643874: When calling SysAllocString, create a PyCObject
      which will eventually call SysFreeString to free the BSTR resource.
    ........
      r53563 | andrew.kuchling | 2007-01-25 21:02:13 +0100 (Thu, 25 Jan 2007) | 1 line
    
      Add item
    ........
      r53564 | brett.cannon | 2007-01-25 21:22:02 +0100 (Thu, 25 Jan 2007) | 8 lines
    
      Fix time.strptime's %U support.  Basically rewrote the algorithm to be more
      generic so that one only has to shift certain values based on whether the week
      was specified to start on Monday or Sunday.  Cut out a lot of edge case code
      compared to the previous version.  Also broke algorithm out into its own
      function (that is private to the module).
    
      Fixes bug #1643943 (thanks Biran Nahas for the report).
    ........
      r53570 | brett.cannon | 2007-01-26 00:30:39 +0100 (Fri, 26 Jan 2007) | 4 lines
    
      Remove specific mention of my name and email address from modules.  Not really
      needed and all bug reports should go to the bug tracker, not directly to me.
      Plus I am not the only person to have edited these files at this point.
    ........
      r53573 | fred.drake | 2007-01-26 17:28:44 +0100 (Fri, 26 Jan 2007) | 1 line
    
      fix typo (extraneous ")")
    ........
      r53575 | georg.brandl | 2007-01-27 18:43:02 +0100 (Sat, 27 Jan 2007) | 4 lines
    
      Patch #1638243: the compiler package is now able to correctly compile
      a with statement; previously, executing code containing a with statement
      compiled by the compiler package crashed the interpreter.
    ........
      r53578 | georg.brandl | 2007-01-27 18:59:42 +0100 (Sat, 27 Jan 2007) | 3 lines
    
      Patch #1634778: add missing encoding aliases for iso8859_15 and
      iso8859_16.
    ........
      r53579 | georg.brandl | 2007-01-27 20:38:50 +0100 (Sat, 27 Jan 2007) | 2 lines
    
      Bug #1645944: os.access now returns bool but docstring is not updated
    ........
      r53590 | brett.cannon | 2007-01-28 21:58:00 +0100 (Sun, 28 Jan 2007) | 2 lines
    
      Use the thread lock's context manager instead of a try/finally statement.
    ........
      r53591 | brett.cannon | 2007-01-29 05:41:44 +0100 (Mon, 29 Jan 2007) | 2 lines
    
      Add a test for slicing an exception.
    ........
      r53594 | andrew.kuchling | 2007-01-29 21:21:43 +0100 (Mon, 29 Jan 2007) | 1 line
    
      Minor edits to the curses HOWTO
    ........
      r53596 | andrew.kuchling | 2007-01-29 21:55:40 +0100 (Mon, 29 Jan 2007) | 1 line
    
      Various minor edits
    ........
      r53597 | andrew.kuchling | 2007-01-29 22:28:48 +0100 (Mon, 29 Jan 2007) | 1 line
    
      More edits
    ........
      r53601 | tim.peters | 2007-01-30 04:03:46 +0100 (Tue, 30 Jan 2007) | 2 lines
    
      Whitespace normalization.
    ........
      r53603 | georg.brandl | 2007-01-30 21:21:30 +0100 (Tue, 30 Jan 2007) | 2 lines
    
      Bug #1648191: typo in docs.
    ........
      r53605 | brett.cannon | 2007-01-30 22:34:36 +0100 (Tue, 30 Jan 2007) | 8 lines
    
      No more raising of string exceptions!
    
      The next step of PEP 352 (for 2.6) causes raising a string exception to trigger
      a TypeError.  Trying to catch a string exception raises a DeprecationWarning.
      References to string exceptions has been removed from the docs since they are
      now just an error.
    ........
      r53618 | raymond.hettinger | 2007-02-01 22:02:59 +0100 (Thu, 01 Feb 2007) | 1 line
    
      Bug #1648179:  set.update() not recognizing __iter__ overrides in dict subclasses.
    ........
    9fe394c1
dummy_threading.py 2.74 KB
"""Faux ``threading`` version using ``dummy_thread`` instead of ``thread``.

The module ``_dummy_threading`` is added to ``sys.modules`` in order
to not have ``threading`` considered imported.  Had ``threading`` been
directly imported it would have made all subsequent imports succeed
regardless of whether ``thread`` was available which is not desired.

"""
from sys import modules as sys_modules

import dummy_thread

# Declaring now so as to not have to nest ``try``s to get proper clean-up.
holding_thread = False
holding_threading = False
holding__threading_local = False

try:
    # Could have checked if ``thread`` was not in sys.modules and gone
    # a different route, but decided to mirror technique used with
    # ``threading`` below.
    if 'thread' in sys_modules:
        held_thread = sys_modules['thread']
        holding_thread = True
    # Must have some module named ``thread`` that implements its API
    # in order to initially import ``threading``.
    sys_modules['thread'] = sys_modules['dummy_thread']

    if 'threading' in sys_modules:
        # If ``threading`` is already imported, might as well prevent
        # trying to import it more than needed by saving it if it is
        # already imported before deleting it.
        held_threading = sys_modules['threading']
        holding_threading = True
        del sys_modules['threading']

    if '_threading_local' in sys_modules:
        # If ``_threading_local`` is already imported, might as well prevent
        # trying to import it more than needed by saving it if it is
        # already imported before deleting it.
        held__threading_local = sys_modules['_threading_local']
        holding__threading_local = True
        del sys_modules['_threading_local']

    import threading
    # Need a copy of the code kept somewhere...
    sys_modules['_dummy_threading'] = sys_modules['threading']
    del sys_modules['threading']
    sys_modules['_dummy__threading_local'] = sys_modules['_threading_local']
    del sys_modules['_threading_local']
    from _dummy_threading import *
    from _dummy_threading import __all__

finally:
    # Put back ``threading`` if we overwrote earlier

    if holding_threading:
        sys_modules['threading'] = held_threading
        del held_threading
    del holding_threading

    # Put back ``_threading_local`` if we overwrote earlier

    if holding__threading_local:
        sys_modules['_threading_local'] = held__threading_local
        del held__threading_local
    del holding__threading_local

    # Put back ``thread`` if we overwrote, else del the entry we made
    if holding_thread:
        sys_modules['thread'] = held_thread
        del held_thread
    else:
        del sys_modules['thread']
    del holding_thread

    del dummy_thread
    del sys_modules