Sun Jul 13 10:52:40 CEST 2008

Author: thomas.lee
Date: Sun Jul 13 10:52:38 2008
New Revision: 64908

Log:
Merged revisions 64887-64907 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64888 | matthias.klose | 2008-07-12 17:51:48 +1000 (Sat, 12 Jul 2008) | 2 lines
  
  - Fix bashisms in Tools/faqwiz/move-faqwiz.sh
........
  r64897 | benjamin.peterson | 2008-07-13 06:16:19 +1000 (Sun, 13 Jul 2008) | 1 line
  
  fix various doc typos #3320
........
  r64900 | alexandre.vassalotti | 2008-07-13 08:06:53 +1000 (Sun, 13 Jul 2008) | 2 lines
  
  Fixed typo.
........
  r64901 | benjamin.peterson | 2008-07-13 09:41:19 +1000 (Sun, 13 Jul 2008) | 1 line
  
  #1778443 robotparser fixes from Aristotelis Mikropoulos
........
  r64903 | brett.cannon | 2008-07-13 11:15:07 +1000 (Sun, 13 Jul 2008) | 6 lines
  
  dummy_thread.acquire() would return None if no waitflag argument was given. It
  should have returned True.
  
  Fixes issue #3339. Thanks, Henk Punt for the report and Andrii v. Mishkovskiyi
  for attempting a patch.
........


Modified:
   python/branches/tlee-ast-optimize/   (props changed)
   python/branches/tlee-ast-optimize/Doc/c-api/conversion.rst
   python/branches/tlee-ast-optimize/Doc/extending/windows.rst
   python/branches/tlee-ast-optimize/Doc/library/__future__.rst
   python/branches/tlee-ast-optimize/Doc/library/ftplib.rst
   python/branches/tlee-ast-optimize/Doc/library/functions.rst
   python/branches/tlee-ast-optimize/Doc/library/imputil.rst
   python/branches/tlee-ast-optimize/Doc/library/macosa.rst
   python/branches/tlee-ast-optimize/Doc/library/multiprocessing.rst
   python/branches/tlee-ast-optimize/Doc/library/operator.rst
   python/branches/tlee-ast-optimize/Doc/library/select.rst
   python/branches/tlee-ast-optimize/Doc/library/stdtypes.rst
   python/branches/tlee-ast-optimize/Doc/library/string.rst
   python/branches/tlee-ast-optimize/Doc/library/thread.rst
   python/branches/tlee-ast-optimize/Doc/library/tix.rst
   python/branches/tlee-ast-optimize/Doc/library/turtle.rst
   python/branches/tlee-ast-optimize/Doc/library/urllib2.rst
   python/branches/tlee-ast-optimize/Doc/library/wsgiref.rst
   python/branches/tlee-ast-optimize/Doc/library/xmlrpclib.rst
   python/branches/tlee-ast-optimize/Doc/tutorial/stdlib2.rst
   python/branches/tlee-ast-optimize/Doc/using/windows.rst
   python/branches/tlee-ast-optimize/Doc/whatsnew/2.6.rst
   python/branches/tlee-ast-optimize/Lib/dummy_thread.py
   python/branches/tlee-ast-optimize/Lib/robotparser.py
   python/branches/tlee-ast-optimize/Lib/test/test_dummy_thread.py
   python/branches/tlee-ast-optimize/Misc/ACKS
   python/branches/tlee-ast-optimize/Misc/NEWS
   python/branches/tlee-ast-optimize/Tools/faqwiz/move-faqwiz.sh

Modified: python/branches/tlee-ast-optimize/Doc/c-api/conversion.rst
==============================================================================

--- python/branches/tlee-ast-optimize/Doc/c-api/conversion.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/c-api/conversion.rst	Sun Jul 13 10:52:38 2008
@@ -89,15 +89,15 @@
    
 .. cfunction:: char * PyOS_stricmp(char *s1, char *s2)
 
-   Case insensitive comparsion of strings. The functions works almost
-   identical to :cfunc:`strcmp` except that it ignores the case.
+   Case insensitive comparison of strings. The function works almost
+   identically to :cfunc:`strcmp` except that it ignores the case.
 
    .. versionadded:: 2.6
 
 
 .. cfunction:: char * PyOS_strnicmp(char *s1, char *s2, Py_ssize_t  size)
 
-   Case insensitive comparsion of strings. The functions works almost
-   identical to :cfunc:`strncmp` except that it ignores the case.
+   Case insensitive comparison of strings. The function works almost
+   identically to :cfunc:`strncmp` except that it ignores the case.
 
    .. versionadded:: 2.6

Modified: python/branches/tlee-ast-optimize/Doc/extending/windows.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/extending/windows.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/extending/windows.rst	Sun Jul 13 10:52:38 2008
@@ -23,7 +23,7 @@
 
    This chapter mentions a number of filenames that include an encoded Python
    version number.  These filenames are represented with the version number shown
-   as ``XY``; in practive, ``'X'`` will be the major version number and ``'Y'``
+   as ``XY``; in practice, ``'X'`` will be the major version number and ``'Y'``
    will be the minor version number of the Python release you're working with.  For
    example, if you are using Python 2.2.1, ``XY`` will actually be ``22``.
 

Modified: python/branches/tlee-ast-optimize/Doc/library/__future__.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/__future__.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/__future__.rst	Sun Jul 13 10:52:38 2008
@@ -16,7 +16,7 @@
 
 * To document when incompatible changes were introduced, and when they will be
   --- or were --- made mandatory.  This is a form of executable documentation, and
-  can be inspected programatically via importing :mod:`__future__` and examining
+  can be inspected programmatically via importing :mod:`__future__` and examining
   its contents.
 
 Each statement in :file:`__future__.py` is of the form::

Modified: python/branches/tlee-ast-optimize/Doc/library/ftplib.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/ftplib.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/ftplib.rst	Sun Jul 13 10:52:38 2008
@@ -316,7 +316,7 @@
 
    Send a ``QUIT`` command to the server and close the connection. This is the
    "polite" way to close a connection, but it may raise an exception of the server
-   reponds with an error to the ``QUIT`` command.  This implies a call to the
+   responds with an error to the ``QUIT`` command.  This implies a call to the
    :meth:`close` method which renders the :class:`FTP` instance useless for
    subsequent calls (see below).
 

Modified: python/branches/tlee-ast-optimize/Doc/library/functions.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/functions.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/functions.rst	Sun Jul 13 10:52:38 2008
@@ -1389,7 +1389,7 @@
 or use in modern Python programming.  They have been kept here to maintain
 backwards compatibility with programs written for older versions of Python.
 
-Python programmers, trainers, students and bookwriters should feel free to
+Python programmers, trainers, students and book writers should feel free to
 bypass these functions without concerns about missing something important.
 
 

Modified: python/branches/tlee-ast-optimize/Doc/library/imputil.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/imputil.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/imputil.rst	Sun Jul 13 10:52:38 2008
@@ -108,7 +108,7 @@
 This code is intended to be read, not executed.  However, it does work
 -- all you need to do to enable it is "import knee".
 
-(The name is a pun on the klunkier predecessor of this module, "ni".)
+(The name is a pun on the clunkier predecessor of this module, "ni".)
 
 ::
 

Modified: python/branches/tlee-ast-optimize/Doc/library/macosa.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/macosa.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/macosa.rst	Sun Jul 13 10:52:38 2008
@@ -6,10 +6,10 @@
 *********************
 
 This chapter describes the current implementation of the Open Scripting
-Architecure (OSA, also commonly referred to as AppleScript) for Python, allowing
-you to control scriptable applications from your Python program, and with a
-fairly pythonic interface. Development on this set of modules has stopped, and a
-replacement is expected for Python 2.5.
+Architecture (OSA, also commonly referred to as AppleScript) for Python,
+allowing you to control scriptable applications from your Python program,
+and with a fairly pythonic interface. Development on this set of modules has
+stopped, and a replacement is expected for Python 2.5.
 
 For a description of the various components of AppleScript and OSA, and to get
 an understanding of the architecture and terminology, you should read Apple's

Modified: python/branches/tlee-ast-optimize/Doc/library/multiprocessing.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/multiprocessing.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/multiprocessing.rst	Sun Jul 13 10:52:38 2008
@@ -160,7 +160,7 @@
 
    The ``'d'`` and ``'i'`` arguments used when creating ``num`` and ``arr`` are
    typecodes of the kind used by the :mod:`array` module: ``'d'`` indicates a
-   double precision float and ``'i'`` inidicates a signed integer.  These shared
+   double precision float and ``'i'`` indicates a signed integer.  These shared
    objects will be process and thread safe.
 
    For more flexibility in using shared memory one can use the
@@ -784,7 +784,7 @@
 
    A bounded semaphore object: a clone of :class:`threading.BoundedSemaphore`.
 
-   (On Mac OSX this is indistiguishable from :class:`Semaphore` because
+   (On Mac OSX this is indistinguishable from :class:`Semaphore` because
    ``sem_getvalue()`` is not implemented on that platform).
 
 .. class:: Condition([lock])
@@ -893,8 +893,8 @@
 
 .. note::
 
-   Although it is posible to store a pointer in shared memory remember that this
-   will refer to a location in the address space of a specific process.
+   Although it is possible to store a pointer in shared memory remember that
+   this will refer to a location in the address space of a specific process.
    However, the pointer is quite likely to be invalid in the context of a second
    process and trying to dereference the pointer from the second process may
    cause a crash.
@@ -1776,7 +1776,7 @@
    handler which sends output to :data:`sys.stderr` using format
    ``'[%(levelname)s/%(processName)s] %(message)s'``.  (The logger allows use of
    the non-standard ``'%(processName)s'`` format.)  Message sent to this logger
-   will not by default propogate to the root logger.
+   will not by default propagate to the root logger.
 
    Note that on Windows child processes will only inherit the level of the
    parent process's logger -- any other customization of the logger will not be

Modified: python/branches/tlee-ast-optimize/Doc/library/operator.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/operator.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/operator.rst	Sun Jul 13 10:52:38 2008
@@ -630,7 +630,7 @@
 +-----------------------+-------------------------+---------------------------------+
 | Right Shift           | ``a >> b``              | ``rshift(a, b)``                |
 +-----------------------+-------------------------+---------------------------------+
-| Sequence Repitition   | ``seq * i``             | ``repeat(seq, i)``              |
+| Sequence Repetition   | ``seq * i``             | ``repeat(seq, i)``              |
 +-----------------------+-------------------------+---------------------------------+
 | Slice Assignment      | ``seq[i:j] = values``   | ``setslice(seq, i, j, values)`` |
 +-----------------------+-------------------------+---------------------------------+

Modified: python/branches/tlee-ast-optimize/Doc/library/select.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/select.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/select.rst	Sun Jul 13 10:52:38 2008
@@ -338,7 +338,7 @@
    +---------------------------+---------------------------------------------+
    | :const:`KQ_EV_DISABLE`    | Disablesevent                               |
    +---------------------------+---------------------------------------------+
-   | :const:`KQ_EV_ONESHOT`    | Removes event after first occurence         |
+   | :const:`KQ_EV_ONESHOT`    | Removes event after first occurrence        |
    +---------------------------+---------------------------------------------+
    | :const:`KQ_EV_CLEAR`      | Reset the state after an event is retrieved |
    +---------------------------+---------------------------------------------+
@@ -373,7 +373,7 @@
    +============================+============================================+
    | :const:`KQ_NOTE_DELETE`    | *unlink()* was called                      |
    +----------------------------+--------------------------------------------+
-   | :const:`KQ_NOTE_WRITE`     | a write occured                            |
+   | :const:`KQ_NOTE_WRITE`     | a write occurred                           |
    +----------------------------+--------------------------------------------+
    | :const:`KQ_NOTE_EXTEND`    | the file was extended                      |
    +----------------------------+--------------------------------------------+

Modified: python/branches/tlee-ast-optimize/Doc/library/stdtypes.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/stdtypes.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/stdtypes.rst	Sun Jul 13 10:52:38 2008
@@ -1543,7 +1543,7 @@
    .. method:: isdisjoint(other)
 
       Return True if the set has no elements in common with *other*.  Sets are
-      disjoint if and only if their interesection is the empty set.
+      disjoint if and only if their intersection is the empty set.
 
       .. versionadded:: 2.6
 

Modified: python/branches/tlee-ast-optimize/Doc/library/string.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/string.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/string.rst	Sun Jul 13 10:52:38 2008
@@ -293,7 +293,7 @@
 
    "noses     "
    
-Which is subsitituted into the string, yielding::
+Which is substituted into the string, yielding::
    
    "A man with two noses     "
    

Modified: python/branches/tlee-ast-optimize/Doc/library/thread.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/thread.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/thread.rst	Sun Jul 13 10:52:38 2008
@@ -7,7 +7,7 @@
 .. note::
    The :mod:`thread` module has been renamed to :mod:`_thread` in Python 3.0.
    The :term:`2to3` tool will automatically adapt imports when converting your
-   sources to 3.0; however, you should consider using the high-lever
+   sources to 3.0; however, you should consider using the high-level
    :mod:`threading` module instead.
 
 

Modified: python/branches/tlee-ast-optimize/Doc/library/tix.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/tix.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/tix.rst	Sun Jul 13 10:52:38 2008
@@ -310,8 +310,8 @@
 .. \ulink{FileEntry}{http://tix.sourceforge.net/dist/current/demos/samples/FileEnt.tcl}
 
 
-Hierachical ListBox
-^^^^^^^^^^^^^^^^^^^
+Hierarchical ListBox
+^^^^^^^^^^^^^^^^^^^^
 
 
 .. class:: HList()

Modified: python/branches/tlee-ast-optimize/Doc/library/turtle.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/turtle.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/turtle.rst	Sun Jul 13 10:52:38 2008
@@ -1275,7 +1275,7 @@
    ...     left(10)
    ...
    >>> for _ in range(8):
-   ...     left(45); fd(2)   # a regular octogon
+   ...     left(45); fd(2)   # a regular octagon
 
 
 Animation control
@@ -1286,7 +1286,7 @@
    :param delay: positive integer
 
    Set or return the drawing *delay* in milliseconds.  (This is approximately
-   the time interval between two consecutived canvas updates.)  The longer the
+   the time interval between two consecutive canvas updates.)  The longer the
    drawing delay, the slower the animation.
 
    Optional argument:

Modified: python/branches/tlee-ast-optimize/Doc/library/urllib2.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/urllib2.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/urllib2.rst	Sun Jul 13 10:52:38 2008
@@ -923,7 +923,7 @@
 obtain the HTTP proxy's URL.
 
 This example replaces the default :class:`ProxyHandler` with one that uses
-programatically-supplied proxy URLs, and adds proxy authorization support with
+programmatically-supplied proxy URLs, and adds proxy authorization support with
 :class:`ProxyBasicAuthHandler`. ::
 
    proxy_handler = urllib2.ProxyHandler({'http': 'http://www.example.com:3128/'})

Modified: python/branches/tlee-ast-optimize/Doc/library/wsgiref.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/wsgiref.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/wsgiref.rst	Sun Jul 13 10:52:38 2008
@@ -415,7 +415,7 @@
       from wsgiref.validate import validator
       from wsgiref.simple_server import make_server
 
-      # Our callable object which is intentionally not compilant to the 
+      # Our callable object which is intentionally not compliant to the 
       # standard, so the validator is going to break
       def simple_app(environ, start_response):
           status = '200 OK' # HTTP Status

Modified: python/branches/tlee-ast-optimize/Doc/library/xmlrpclib.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/library/xmlrpclib.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/library/xmlrpclib.rst	Sun Jul 13 10:52:38 2008
@@ -379,7 +379,7 @@
    try:
        proxy.add(2, 5)
    except xmlrpclib.Fault, err:
-       print "A fault occured"
+       print "A fault occurred"
        print "Fault code: %d" % err.faultCode
        print "Fault string: %s" % err.faultString
 
@@ -426,7 +426,7 @@
    try:
        proxy.some_method()
    except xmlrpclib.ProtocolError, err:
-       print "A protocol error occured"
+       print "A protocol error occurred"
        print "URL: %s" % err.url
        print "HTTP/HTTPS headers: %s" % err.headers
        print "Error code: %d" % err.errcode

Modified: python/branches/tlee-ast-optimize/Doc/tutorial/stdlib2.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/tutorial/stdlib2.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/tutorial/stdlib2.rst	Sun Jul 13 10:52:38 2008
@@ -286,7 +286,7 @@
 performance trade-offs.
 
 The :mod:`array` module provides an :class:`array()` object that is like a list
-that stores only homogenous data and stores it more compactly.  The following
+that stores only homogeneous data and stores it more compactly.  The following
 example shows an array of numbers stored as two byte unsigned binary numbers
 (typecode ``"H"``) rather than the usual 16 bytes per entry for regular lists of
 python int objects::

Modified: python/branches/tlee-ast-optimize/Doc/using/windows.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/using/windows.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/using/windows.rst	Sun Jul 13 10:52:38 2008
@@ -188,7 +188,7 @@
 startup.
 
 You can also make all ``.py`` scripts execute with :program:`pythonw.exe`,
-setting this through the usual facilites, for example (might require
+setting this through the usual facilities, for example (might require
 administrative rights):
 
 #. Launch a command prompt.
@@ -217,7 +217,7 @@
 
 The `PyWin32 <http://python.net/crew/mhammond/win32/>`_ module by Mark Hammond
 is a collection of modules for advanced Windows-specific support.  This includes
-utilites for:
+utilities for:
 
 * `Component Object Model <http://www.microsoft.com/com/>`_ (COM)
 * Win32 API calls

Modified: python/branches/tlee-ast-optimize/Doc/whatsnew/2.6.rst
==============================================================================
--- python/branches/tlee-ast-optimize/Doc/whatsnew/2.6.rst	(original)
+++ python/branches/tlee-ast-optimize/Doc/whatsnew/2.6.rst	Sun Jul 13 10:52:38 2008
@@ -529,7 +529,7 @@
 .. XXX I think this still needs help
 
 :mod:`multiprocessing` makes it easy to distribute work over multiple processes.
-Its API is similiar to that of :mod:`threading`.  For example::
+Its API is similar to that of :mod:`threading`.  For example::
 
     from multiprocessing import Process
 

Modified: python/branches/tlee-ast-optimize/Lib/dummy_thread.py
==============================================================================
--- python/branches/tlee-ast-optimize/Lib/dummy_thread.py	(original)
+++ python/branches/tlee-ast-optimize/Lib/dummy_thread.py	Sun Jul 13 10:52:38 2008
@@ -104,18 +104,15 @@
         aren't triggered and throw a little fit.
 
         """
-        if waitflag is None:
+        if waitflag is None or waitflag:
             self.locked_status = True
-            return None
-        elif not waitflag:
+            return True
+        else:
             if not self.locked_status:
                 self.locked_status = True
                 return True
             else:
                 return False
-        else:
-            self.locked_status = True
-            return True
 
     __enter__ = acquire
 

Modified: python/branches/tlee-ast-optimize/Lib/robotparser.py
==============================================================================
--- python/branches/tlee-ast-optimize/Lib/robotparser.py	(original)
+++ python/branches/tlee-ast-optimize/Lib/robotparser.py	Sun Jul 13 10:52:38 2008
@@ -55,11 +55,8 @@
         """Reads the robots.txt URL and feeds it to the parser."""
         opener = URLopener()
         f = opener.open(self.url)
-        lines = []
-        line = f.readline()
-        while line:
-            lines.append(line.strip())
-            line = f.readline()
+        lines = [line.strip() for line in f]
+        f.close()
         self.errcode = opener.errcode
         if self.errcode in (401, 403):
             self.disallow_all = True
@@ -84,7 +81,7 @@
         entry = Entry()
 
         for line in lines:
-            linenumber = linenumber + 1
+            linenumber += 1
             if not line:
                 if state == 1:
                     entry = Entry()

Modified: python/branches/tlee-ast-optimize/Lib/test/test_dummy_thread.py
==============================================================================
--- python/branches/tlee-ast-optimize/Lib/test/test_dummy_thread.py	(original)
+++ python/branches/tlee-ast-optimize/Lib/test/test_dummy_thread.py	Sun Jul 13 10:52:38 2008
@@ -60,6 +60,7 @@
         #Make sure that an unconditional locking returns True.
         self.failUnless(self.lock.acquire(1) is True,
                         "Unconditional locking did not return True.")
+        self.failUnless(self.lock.acquire() is True)
 
     def test_uncond_acquire_blocking(self):
         #Make sure that unconditional acquiring of a locked lock blocks.

Modified: python/branches/tlee-ast-optimize/Misc/ACKS
==============================================================================
--- python/branches/tlee-ast-optimize/Misc/ACKS	(original)
+++ python/branches/tlee-ast-optimize/Misc/ACKS	Sun Jul 13 10:52:38 2008
@@ -460,6 +460,7 @@
 Mike Meyer
 Steven Miale
 Trent Mick
+Aristotelis Mikropoulos
 Damien Miller
 Chad Miller
 Jay T. Miller

Modified: python/branches/tlee-ast-optimize/Misc/NEWS
==============================================================================
--- python/branches/tlee-ast-optimize/Misc/NEWS	(original)
+++ python/branches/tlee-ast-optimize/Misc/NEWS	Sun Jul 13 10:52:38 2008
@@ -10,7 +10,6 @@
 Core and Builtins
 -----------------
 
-
 - Issue #2517: Allow unicode messages in Exceptions again by correctly
   bypassing the instance dictionary when looking up __unicode__ on
   new-style classes.
@@ -41,6 +40,8 @@
 Library
 -------
 
+- Issue #3339: dummy_thread.acquire() should not return None.
+
 - Issue #3285: Fractions from_float() and from_decimal() accept Integral arguments.
 
 - Issue #3301: Bisect module behaved badly when lo was negative.

Modified: python/branches/tlee-ast-optimize/Tools/faqwiz/move-faqwiz.sh
==============================================================================
--- python/branches/tlee-ast-optimize/Tools/faqwiz/move-faqwiz.sh	(original)
+++ python/branches/tlee-ast-optimize/Tools/faqwiz/move-faqwiz.sh	Sun Jul 13 10:52:38 2008
@@ -9,7 +9,7 @@
 #   blackjesus:~> ./move-faqwiz.sh 2\.1 3\.2
 #   Moving FAQ question 02.001 to 03.002
 
-if [ x$2 == x ]; then
+if [ x$2 = x ]; then
     echo "Need 2 args: original_version final_version."
     exit 2
 fi
@@ -19,7 +19,7 @@
     exit 2
 fi
 
-function cut_n_pad() {
+cut_n_pad() {
     t=`echo $1 | cut -d. -f $2`
     export $3=`echo $t | awk "{ tmp = \\$0; l = length(tmp); for (i = 0; i < $2-l+1; i++) { tmp = "0".tmp } print tmp  }"`
 }
@@ -28,7 +28,13 @@
 cut_n_pad $1 2 suffix1
 cut_n_pad $2 1 prefix2
 cut_n_pad $2 2 suffix2
-tmpfile=tmp$RANDOM.tmp
+if which tempfile >/dev/null; then
+    tmpfile=$(tempfile -d .)
+elif [ -n "$RANDOM" ]; then
+    tmpfile=tmp$RANDOM.tmp
+else
+    tmpfile=tmp$$.tmp
+fi
 file1=faq$prefix1.$suffix1.htp
 file2=faq$prefix2.$suffix2.htp
 
