[Python-3000-checkins] r64222 - in python/branches/py3k: Doc/includes/mp_distributing.py Doc/library/queue.rst Doc/library/socketserver.rst Doc/library/threading.rst Lib/decimal.py Lib/idlelib/rpc.py Misc/NEWS
georg.brandl
python-3000-checkins at python.org
Fri Jun 13 08:32:25 CEST 2008
Author: georg.brandl
Date: Fri Jun 13 08:32:25 2008
New Revision: 64222
Log:
Fix last traces of old threading API.
Modified:
python/branches/py3k/Doc/includes/mp_distributing.py
python/branches/py3k/Doc/library/queue.rst
python/branches/py3k/Doc/library/socketserver.rst
python/branches/py3k/Doc/library/threading.rst
python/branches/py3k/Lib/decimal.py
python/branches/py3k/Lib/idlelib/rpc.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Doc/includes/mp_distributing.py
==============================================================================
--- python/branches/py3k/Doc/includes/mp_distributing.py (original)
+++ python/branches/py3k/Doc/includes/mp_distributing.py Fri Jun 13 08:32:25 2008
@@ -243,7 +243,7 @@
try:
self.queue.clear()
self.queue.extend(contents)
- self.not_empty.notifyAll()
+ self.not_empty.notify_all()
finally:
self.not_empty.release()
Modified: python/branches/py3k/Doc/library/queue.rst
==============================================================================
--- python/branches/py3k/Doc/library/queue.rst (original)
+++ python/branches/py3k/Doc/library/queue.rst Fri Jun 13 08:32:25 2008
@@ -147,7 +147,7 @@
q = Queue()
for i in range(num_worker_threads):
t = Thread(target=worker)
- t.setDaemon(True)
+ t.set_daemon(True)
t.start()
for item in source():
Modified: python/branches/py3k/Doc/library/socketserver.rst
==============================================================================
--- python/branches/py3k/Doc/library/socketserver.rst (original)
+++ python/branches/py3k/Doc/library/socketserver.rst Fri Jun 13 08:32:25 2008
@@ -480,8 +480,8 @@
def handle(self):
data = self.request.recv(1024)
- cur_thread = threading.currentThread()
- response = "%s: %s" % (cur_thread.getName(), data)
+ cur_thread = threading.current_thread()
+ response = "%s: %s" % (cur_thread.get_name(), data)
self.request.send(response)
class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
@@ -506,9 +506,9 @@
# more thread for each request
server_thread = threading.Thread(target=server.serve_forever)
# Exit the server thread when the main thread terminates
- server_thread.setDaemon(True)
+ server_thread.set_daemon(True)
server_thread.start()
- print "Server loop running in thread:", t.getName()
+ print "Server loop running in thread:", t.get_name()
client(ip, port, "Hello World 1")
client(ip, port, "Hello World 2")
Modified: python/branches/py3k/Doc/library/threading.rst
==============================================================================
--- python/branches/py3k/Doc/library/threading.rst (original)
+++ python/branches/py3k/Doc/library/threading.rst Fri Jun 13 08:32:25 2008
@@ -283,29 +283,29 @@
A condition variable has :meth:`acquire` and :meth:`release` methods that call
the corresponding methods of the associated lock. It also has a :meth:`wait`
-method, and :meth:`notify` and :meth:`notifyAll` methods. These three must only
+method, and :meth:`notify` and :meth:`notify_all` methods. These three must only
be called when the calling thread has acquired the lock, otherwise a
:exc:`RuntimeError` is raised.
The :meth:`wait` method releases the lock, and then blocks until it is awakened
-by a :meth:`notify` or :meth:`notifyAll` call for the same condition variable in
+by a :meth:`notify` or :meth:`notify_all` call for the same condition variable in
another thread. Once awakened, it re-acquires the lock and returns. It is also
possible to specify a timeout.
The :meth:`notify` method wakes up one of the threads waiting for the condition
-variable, if any are waiting. The :meth:`notifyAll` method wakes up all threads
+variable, if any are waiting. The :meth:`notify_all` method wakes up all threads
waiting for the condition variable.
-Note: the :meth:`notify` and :meth:`notifyAll` methods don't release the lock;
+Note: the :meth:`notify` and :meth:`notify_all` methods don't release the lock;
this means that the thread or threads awakened will not return from their
:meth:`wait` call immediately, but only when the thread that called
-:meth:`notify` or :meth:`notifyAll` finally relinquishes ownership of the lock.
+:meth:`notify` or :meth:`notify_all` finally relinquishes ownership of the lock.
Tip: the typical programming style using condition variables uses the lock to
synchronize access to some shared state; threads that are interested in a
particular change of state call :meth:`wait` repeatedly until they see the
desired state, while threads that modify the state call :meth:`notify` or
-:meth:`notifyAll` when they change the state in such a way that it could
+:meth:`notify_all` when they change the state in such a way that it could
possibly be a desired state for one of the waiters. For example, the following
code is a generic producer-consumer situation with unlimited buffer capacity::
@@ -322,7 +322,7 @@
cv.notify()
cv.release()
-To choose between :meth:`notify` and :meth:`notifyAll`, consider whether one
+To choose between :meth:`notify` and :meth:`notify_all`, consider whether one
state change can be interesting for only one or several waiting threads. E.g.
in a typical producer-consumer situation, adding one item to the buffer only
needs to wake up one consumer thread.
@@ -353,7 +353,7 @@
acquired the lock when this method is called, a :exc:`RuntimeError` is raised.
This method releases the underlying lock, and then blocks until it is awakened
- by a :meth:`notify` or :meth:`notifyAll` call for the same condition variable in
+ by a :meth:`notify` or :meth:`notify_all` call for the same condition variable in
another thread, or until the optional timeout occurs. Once awakened or timed
out, it re-acquires the lock and returns.
@@ -490,7 +490,7 @@
The internal flag is initially false.
-.. method:: Event.isSet()
+.. method:: Event.is_set()
Return true if and only if the internal flag is true.
@@ -537,7 +537,7 @@
Once the thread's activity is started, the thread is considered 'alive'. It
stops being alive when its :meth:`run` method terminates -- either normally, or
-by raising an unhandled exception. The :meth:`isAlive` method tests whether the
+by raising an unhandled exception. The :meth:`is_alive` method tests whether the
thread is alive.
Other threads can call a thread's :meth:`join` method. This blocks the calling
@@ -614,7 +614,7 @@
When the *timeout* argument is present and not ``None``, it should be a floating
point number specifying a timeout for the operation in seconds (or fractions
- thereof). As :meth:`join` always returns ``None``, you must call :meth:`isAlive`
+ thereof). As :meth:`join` always returns ``None``, you must call :meth:`is_alive`
after :meth:`join` to decide whether a timeout happened -- if the thread is
still alive, the :meth:`join` call timed out.
Modified: python/branches/py3k/Lib/decimal.py
==============================================================================
--- python/branches/py3k/Lib/decimal.py (original)
+++ python/branches/py3k/Lib/decimal.py Fri Jun 13 08:32:25 2008
@@ -383,7 +383,7 @@
# The getcontext() and setcontext() function manage access to a thread-local
# current context. Py2.4 offers direct support for thread locals. If that
-# is not available, use threading.currentThread() which is slower but will
+# is not available, use threading.current_thread() which is slower but will
# work for older Pythons. If threads are not part of the build, create a
# mock threading object with threading.local() returning the module namespace.
@@ -405,15 +405,15 @@
# To fix reloading, force it to create a new context
# Old contexts have different exceptions in their dicts, making problems.
- if hasattr(threading.currentThread(), '__decimal_context__'):
- del threading.currentThread().__decimal_context__
+ if hasattr(threading.current_thread(), '__decimal_context__'):
+ del threading.current_thread().__decimal_context__
def setcontext(context):
"""Set this thread's context to context."""
if context in (DefaultContext, BasicContext, ExtendedContext):
context = context.copy()
context.clear_flags()
- threading.currentThread().__decimal_context__ = context
+ threading.current_thread().__decimal_context__ = context
def getcontext():
"""Returns this thread's context.
@@ -423,10 +423,10 @@
New contexts are copies of DefaultContext.
"""
try:
- return threading.currentThread().__decimal_context__
+ return threading.current_thread().__decimal_context__
except AttributeError:
context = Context()
- threading.currentThread().__decimal_context__ = context
+ threading.current_thread().__decimal_context__ = context
return context
else:
Modified: python/branches/py3k/Lib/idlelib/rpc.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/rpc.py (original)
+++ python/branches/py3k/Lib/idlelib/rpc.py Fri Jun 13 08:32:25 2008
@@ -149,7 +149,7 @@
def debug(self, *args):
if not self.debugging:
return
- s = self.location + " " + str(threading.current_thread().getName())
+ s = self.location + " " + str(threading.current_thread().get_name())
for a in args:
s = s + " " + str(a)
print(s, file=sys.__stderr__)
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Fri Jun 13 08:32:25 2008
@@ -175,7 +175,7 @@
- The test.test_support module has been renamed to test.support.
-- The threading module API's were renamed to by PEP 8 complaint.
+- The threading module API was renamed to be PEP 8 complaint.
Tools/Demos
-----------
More information about the Python-3000-checkins
mailing list