Partial py3k-ification of Doc/library/: convert has_key references into either 'k in d' or __contains__; normalize raise statements; convert print statements into print function calls.

collinw · collinw · commit c79461b1648c · 2007-09-01T23:34:30.000Z
diff --git a/Doc/library/bsddb.rst b/Doc/library/bsddb.rst
@@ -105,6 +105,11 @@ Once instantiated, hash, btree and record objects support the same methods as
 dictionaries.  In addition, they support the methods listed below.
 
 
+.. describe:: key in bsddbobject
+
+   Return ``True`` if the DB file contains the argument as a key.
+
+
 .. method:: bsddbobject.close()
 
    Close the underlying file.  The object can no longer be accessed.  Since there
@@ -119,11 +124,6 @@ dictionaries.  In addition, they support the methods listed below.
    returned is different for different file formats.
 
 
-.. method:: bsddbobject.has_key(key)
-
-   Return ``1`` if the DB file contains the argument as a key.
-
-
 .. method:: bsddbobject.set_location(key)
 
    Set the cursor to the item indicated by *key* and return a tuple containing the
@@ -169,7 +169,8 @@ Example::
 
    >>> import bsddb
    >>> db = bsddb.btopen('/tmp/spam.db', 'c')
-   >>> for i in range(10): db['%d'%i] = '%d'% (i*i)
+   >>> for i in range(10):
+   ...     db[str(i)] = '%d' % (i*i)
    ... 
    >>> db['3']
    '9'
@@ -186,7 +187,7 @@ Example::
    >>> db.previous() 
    ('1', '1')
    >>> for k, v in db.iteritems():
-   ...     print k, v
+   ...     print(k, v)
    0 0
    1 1
    2 4
diff --git a/Doc/library/cgi.rst b/Doc/library/cgi.rst
@@ -91,19 +91,19 @@ various environment variables set according to the CGI standard).  Since it may
 consume standard input, it should be instantiated only once.
 
 The :class:`FieldStorage` instance can be indexed like a Python dictionary, and
-also supports the standard dictionary methods :meth:`has_key` and :meth:`keys`.
-The built-in :func:`len` is also supported.  Form fields containing empty
-strings are ignored and do not appear in the dictionary; to keep such values,
-provide a true value for the optional *keep_blank_values* keyword parameter when
-creating the :class:`FieldStorage` instance.
+also supports the standard dictionary methods :meth:`__contains__` and
+:meth:`keys`.  The built-in :func:`len` is also supported.  Form fields
+containing empty strings are ignored and do not appear in the dictionary; to
+keep such values, provide a true value for the optional *keep_blank_values*
+keyword parameter when creating the :class:`FieldStorage` instance.
 
 For instance, the following code (which assumes that the
 :mailheader:`Content-Type` header and blank line have already been printed)
 checks that the fields ``name`` and ``addr`` are both set to a non-empty
 string::
 
    form = cgi.FieldStorage()
-   if not (form.has_key("name") and form.has_key("addr")):
+   if not ("name" in form and "addr" in form):
        print "<H1>Error</H1>"
        print "Please fill in the name and addr fields."
        return
diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst
@@ -200,7 +200,7 @@ included in the mapping interface.
    No exception is raised if the named field isn't present in the headers.
 
 
-.. method:: Message.has_key(name)
+.. method:: Message.__contains__(name)
 
    Return true if the message contains a header field named *name*, otherwise
    return false.
diff --git a/Doc/library/imputil.rst b/Doc/library/imputil.rst
@@ -122,10 +122,10 @@ This code is intended to be read, not executed.  However, it does work
        return m
 
    def determine_parent(globals):
-       if not globals or  not globals.has_key("__name__"):
+       if not globals or  not "__name__" in globals:
            return None
        pname = globals['__name__']
-       if globals.has_key("__path__"):
+       if "__path__" in globals:
            parent = sys.modules[pname]
            assert globals is parent.__dict__
            return parent
@@ -156,7 +156,7 @@ This code is intended to be read, not executed.  However, it does work
            parent = None
            q = import_module(head, qname, parent)
            if q: return q, tail
-       raise ImportError, "No module named " + qname
+       raise ImportError("No module named " + qname)
 
    def load_tail(q, tail):
        m = q
@@ -167,7 +167,7 @@ This code is intended to be read, not executed.  However, it does work
            mname = "%s.%s" % (m.__name__, head)
            m = import_module(head, mname, m)
            if not m:
-               raise ImportError, "No module named " + mname
+               raise ImportError("No module named " + mname)
        return m
 
    def ensure_fromlist(m, fromlist, recursive=0):
@@ -185,7 +185,7 @@ This code is intended to be read, not executed.  However, it does work
                subname = "%s.%s" % (m.__name__, sub)
                submod = import_module(sub, subname, m)
                if not submod:
-                   raise ImportError, "No module named " + subname
+                   raise ImportError("No module named " + subname)
 
    def import_module(partname, fqname, parent):
        try:
diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
@@ -188,8 +188,7 @@ the corresponding message is subsequently removed.
       subclass.
 
 
-.. method:: Mailbox.has_key(key)
-            Mailbox.__contains__(key)
+.. method:: Mailbox.__contains__(key)
 
    Return ``True`` if *key* corresponds to a message, ``False`` otherwise.
 
diff --git a/Doc/library/rfc822.rst b/Doc/library/rfc822.rst
@@ -260,7 +260,7 @@ A :class:`Message` instance has the following methods:
 :class:`Message` instances also support a limited mapping interface. In
 particular: ``m[name]`` is like ``m.getheader(name)`` but raises :exc:`KeyError`
 if there is no matching header; and ``len(m)``, ``m.get(name[, default])``,
-``m.has_key(name)``, ``m.keys()``, ``m.values()`` ``m.items()``, and
+``m.__contains__(name)``, ``m.keys()``, ``m.values()`` ``m.items()``, and
 ``m.setdefault(name[, default])`` act as expected, with the one difference
 that :meth:`setdefault` uses an empty string as the default value.
 :class:`Message` instances also support the mapping writable interface ``m[name]
diff --git a/Doc/library/shelve.rst b/Doc/library/shelve.rst
@@ -131,7 +131,7 @@ object)::
                    # such key)
    del d[key]      # delete data stored at key (raises KeyError
                    # if no such key)
-   flag = d.has_key(key)   # true if the key exists
+   flag = key in d   # true if the key exists
    klist = d.keys() # a list of all existing keys (slow!)
 
    # as d was opened WITHOUT writeback=True, beware:
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
@@ -157,5 +157,5 @@ provided by this module. ::
        except OSError as why:
            errors.extend((src, dst, str(why)))
        if errors:
-           raise Error, errors
+           raise Error(errors)
 
diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst
@@ -144,7 +144,7 @@ be sent, and the handler raises an exception. ::
 
    def handler(signum, frame):
        print 'Signal handler called with signal', signum
-       raise IOError, "Couldn't open device!"
+       raise IOError("Couldn't open device!")
 
    # Set the signal handler and a 5-second alarm
    signal.signal(signal.SIGALRM, handler)
diff --git a/Doc/library/stat.rst b/Doc/library/stat.rst
@@ -157,10 +157,10 @@ Example::
                callback(pathname)
            else:
                # Unknown file type, print a message
-               print 'Skipping %s' % pathname
+               print('Skipping %s' % pathname)
 
    def visitfile(file):
-       print 'visiting', file
+       print('visiting', file)
 
    if __name__ == '__main__':
        walktree(sys.argv[1], visitfile)
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
@@ -1032,8 +1032,8 @@ formats in the string *must* include a parenthesised mapping key into that
 dictionary inserted immediately after the ``'%'`` character. The mapping key
 selects the value to be formatted from the mapping.  For example::
 
-   >>> print '%(language)s has %(#)03d quote types.' % \
-             {'language': "Python", "#": 2}
+   >>> print('%(language)s has %(#)03d quote types.' %
+             {'language': "Python", "#": 2})
    Python has 002 quote types.
 
 In this case no ``*`` specifiers may occur in a format (since they require a
@@ -1805,10 +1805,6 @@ types should support too):
    *default* is not given, it defaults to ``None``, so that this method never
    raises a :exc:`KeyError`.
 
-.. method:: dict.has_key(key)
-
-   ``d.has_key(key)`` is equivalent to ``key in d``, but deprecated.
-
 .. method:: dict.items()
 
    Return a copy of the dictionary's list of ``(key, value)`` pairs.
@@ -1923,15 +1919,15 @@ Files have the following methods:
 
       with open("hello.txt") as f:
           for line in f:
-              print line
+              print(line)
 
    In older versions of Python, you would have needed to do this to get the same
    effect::
 
       f = open("hello.txt")
       try:
           for line in f:
-              print line
+              print(line)
       finally:
           f.close()
 
diff --git a/Doc/library/stringio.rst b/Doc/library/stringio.rst
@@ -45,7 +45,7 @@ Example usage::
 
    output = StringIO.StringIO()
    output.write('First line.\n')
-   print >>output, 'Second line.'
+   print('Second line.', file=output)
 
    # Retrieve file contents -- this will be
    # 'First line.\nSecond line.\n'
@@ -111,7 +111,7 @@ Example usage::
 
    output = cStringIO.StringIO()
    output.write('First line.\n')
-   print >>output, 'Second line.'
+   print('Second line.', file=output)
 
    # Retrieve file contents -- this will be
    # 'First line.\nSecond line.\n'
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
@@ -284,11 +284,11 @@ A more realistic example would look like this::
    try:
        retcode = call("mycmd" + " myarg", shell=True)
        if retcode < 0:
-           print >>sys.stderr, "Child was terminated by signal", -retcode
+           print("Child was terminated by signal", -retcode, file=sys.stderr)
        else:
-           print >>sys.stderr, "Child returned", retcode
+           print("Child returned", retcode, file=sys.stderr)
    except OSError as e:
-       print >>sys.stderr, "Execution failed:", e
+       print("Execution failed:", e, file=sys.stderr)
 
 
 Replacing os.spawn\*
diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
@@ -601,13 +601,13 @@ How to read a gzip compressed tar archive and display some member information::
    import tarfile
    tar = tarfile.open("sample.tar.gz", "r:gz")
    for tarinfo in tar:
-       print tarinfo.name, "is", tarinfo.size, "bytes in size and is",
+       print(tarinfo.name, "is", tarinfo.size, "bytes in size and is", end="")
        if tarinfo.isreg():
-           print "a regular file."
+           print("a regular file.")
        elif tarinfo.isdir():
-           print "a directory."
+           print("a directory.")
        else:
-           print "something else."
+           print("something else.")
    tar.close()
 
 How to create a tar archive with faked information::
diff --git a/Doc/library/telnetlib.rst b/Doc/library/telnetlib.rst
@@ -234,5 +234,5 @@ A simple example illustrating typical use::
    tn.write("ls\n")
    tn.write("exit\n")
 
-   print tn.read_all()
+   print(tn.read_all())
 
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
@@ -307,7 +307,7 @@ The :mod:`test.test_support` module defines the following functions:
    Example use::
 
       with captured_stdout() as s:
-          print "hello"
+          print("hello")
       assert s.getvalue() == "hello"
 
 
diff --git a/Doc/library/textwrap.rst b/Doc/library/textwrap.rst
@@ -64,8 +64,8 @@ indentation from strings that have unwanted whitespace to the left of the text.
           hello
             world
           '''
-          print repr(s)          # prints '    hello\n      world\n    '
-          print repr(dedent(s))  # prints 'hello\n  world\n'
+          print(repr(s))          # prints '    hello\n      world\n    '
+          print(repr(dedent(s)))  # prints 'hello\n  world\n'
 
 
 .. class:: TextWrapper(...)
diff --git a/Doc/library/thread.rst b/Doc/library/thread.rst
@@ -135,7 +135,7 @@ In addition to these methods, lock objects can also be used via the
    a_lock = thread.allocate_lock()
 
    with a_lock:
-       print "a_lock is locked while this executes"
+       print("a_lock is locked while this executes")
 
 **Caveats:**
 
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
@@ -683,7 +683,7 @@ exactly the same as the interval specified by the user.
 For example::
 
    def hello():
-       print "hello, world"
+       print("hello, world")
 
    t = Timer(30.0, hello)
    t.start() # after 30 seconds, "hello, world" will be printed
@@ -721,5 +721,5 @@ Currently, :class:`Lock`, :class:`RLock`, :class:`Condition`,
    some_rlock = threading.RLock()
 
    with some_rlock:
-       print "some_rlock is locked while this executes"
+       print("some_rlock is locked while this executes")
 
diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst
@@ -196,13 +196,13 @@ attributes. ::
    ...     pass
    ... """
    >>> t = timeit.Timer(stmt=s)
-   >>> print "%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)
+   >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000))
    17.09 usec/pass
    >>> s = """\
    ... if hasattr(str, '__bool__'): pass
    ... """
    >>> t = timeit.Timer(stmt=s)
-   >>> print "%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)
+   >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000))
    4.85 usec/pass
    >>> s = """\
    ... try:
@@ -211,26 +211,24 @@ attributes. ::
    ...     pass
    ... """
    >>> t = timeit.Timer(stmt=s)
-   >>> print "%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)
+   >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000))
    1.97 usec/pass
    >>> s = """\
    ... if hasattr(int, '__bool__'): pass
    ... """
    >>> t = timeit.Timer(stmt=s)
-   >>> print "%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000)
+   >>> print("%.2f usec/pass" % (1000000 * t.timeit(number=100000)/100000))
    3.15 usec/pass
 
 To give the :mod:`timeit` module access to functions you define, you can pass a
 ``setup`` parameter which contains an import statement::
 
    def test():
        "Stupid test function"
-       L = []
-       for i in range(100):
-           L.append(i)
+       L = [i for i in range(100)]
 
    if __name__=='__main__':
        from timeit import Timer
        t = Timer("test()", "from __main__ import test")
-       print t.timeit()
+       print(t.timeit())
 
diff --git a/Doc/library/tix.rst b/Doc/library/tix.rst
@@ -505,7 +505,7 @@ Tix Commands
 
       import Tix
       root = Tix.Tk()
-      print root.tix_configure()
+      print(root.tix_configure())
 
 
 .. method:: tixCommand.tix_configure([cnf,] **kw)
diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst
diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst
diff --git a/Doc/library/weakref.rst b/Doc/library/weakref.rst
diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
diff --git a/Doc/library/xdrlib.rst b/Doc/library/xdrlib.rst
diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
diff --git a/Doc/library/xml.sax.utils.rst b/Doc/library/xml.sax.utils.rst
diff --git a/Doc/library/xmlrpclib.rst b/Doc/library/xmlrpclib.rst
