Fri Feb 20 04:31:24 CET 2009

Author: benjamin.peterson
Date: Fri Feb 20 04:31:23 2009
New Revision: 69795

Log:
revert r69777 since all the experts agree that extra import lines distract from the code

Modified:
   python/trunk/Doc/howto/doanddont.rst
   python/trunk/Doc/howto/webservers.rst
   python/trunk/Doc/includes/sqlite3/adapter_datetime.py
   python/trunk/Doc/library/asyncore.rst
   python/trunk/Doc/library/cgi.rst
   python/trunk/Doc/library/configparser.rst
   python/trunk/Doc/library/cookielib.rst
   python/trunk/Doc/library/crypt.rst
   python/trunk/Doc/library/csv.rst
   python/trunk/Doc/library/difflib.rst
   python/trunk/Doc/library/doctest.rst
   python/trunk/Doc/library/fcntl.rst
   python/trunk/Doc/library/getopt.rst
   python/trunk/Doc/library/gl.rst
   python/trunk/Doc/library/imaplib.rst
   python/trunk/Doc/library/imputil.rst
   python/trunk/Doc/library/logging.rst
   python/trunk/Doc/library/modulefinder.rst
   python/trunk/Doc/library/pickle.rst
   python/trunk/Doc/library/poplib.rst
   python/trunk/Doc/library/signal.rst
   python/trunk/Doc/library/sqlite3.rst
   python/trunk/Doc/library/ssl.rst
   python/trunk/Doc/library/stat.rst
   python/trunk/Doc/library/sunaudio.rst
   python/trunk/Doc/library/termios.rst
   python/trunk/Doc/library/traceback.rst
   python/trunk/Doc/library/xmlrpclib.rst
   python/trunk/Doc/tutorial/interactive.rst
   python/trunk/Doc/tutorial/stdlib2.rst
   python/trunk/Doc/whatsnew/2.6.rst

Modified: python/trunk/Doc/howto/doanddont.rst
==============================================================================

--- python/trunk/Doc/howto/doanddont.rst	(original)
+++ python/trunk/Doc/howto/doanddont.rst	Fri Feb 20 04:31:23 2009
@@ -267,8 +267,7 @@
 :func:`max`/:func:`min`. Another highly useful function is :func:`reduce`. A
 classical use of :func:`reduce` is something like ::
 
-   import operator
-   import sys
+   import sys, operator
    nums = map(float, sys.argv[1:])
    print reduce(operator.add, nums)/len(nums)
 

Modified: python/trunk/Doc/howto/webservers.rst
==============================================================================
--- python/trunk/Doc/howto/webservers.rst	(original)
+++ python/trunk/Doc/howto/webservers.rst	Fri Feb 20 04:31:23 2009
@@ -99,8 +99,7 @@
     # -*- coding: UTF-8 -*-
 
     # enable debugging
-    import cgitb
-    cgitb.enable()
+    import cgitb; cgitb.enable()
 
     print "Content-Type: text/plain;charset=utf-8"
     print
@@ -280,9 +279,7 @@
     # -*- coding: UTF-8 -*-
 
     from cgi import escape
-    import os
-    import sys
-
+    import sys, os
     from flup.server.fcgi import WSGIServer
 
     def app(environ, start_response):

Modified: python/trunk/Doc/includes/sqlite3/adapter_datetime.py
==============================================================================
--- python/trunk/Doc/includes/sqlite3/adapter_datetime.py	(original)
+++ python/trunk/Doc/includes/sqlite3/adapter_datetime.py	Fri Feb 20 04:31:23 2009
@@ -1,6 +1,5 @@
-import datetime
 import sqlite3
-import time
+import datetime, time
 
 def adapt_datetime(ts):
     return time.mktime(ts.timetuple())

Modified: python/trunk/Doc/library/asyncore.rst
==============================================================================
--- python/trunk/Doc/library/asyncore.rst	(original)
+++ python/trunk/Doc/library/asyncore.rst	Fri Feb 20 04:31:23 2009
@@ -246,8 +246,7 @@
 Here is a very basic HTTP client that uses the :class:`dispatcher` class to
 implement its socket handling::
 
-   import asyncore
-   import socket
+   import asyncore, socket
 
    class http_client(asyncore.dispatcher):
 

Modified: python/trunk/Doc/library/cgi.rst
==============================================================================
--- python/trunk/Doc/library/cgi.rst	(original)
+++ python/trunk/Doc/library/cgi.rst	Fri Feb 20 04:31:23 2009
@@ -67,20 +67,16 @@
 module defines all sorts of names for its own use or for backward compatibility
 that you don't want in your namespace.
 
-When you write a new script, consider adding the following::
+When you write a new script, consider adding the line::
 
-   import cgitb
-
-   cgitb.enable()
+   import cgitb; cgitb.enable()
 
 This activates a special exception handler that will display detailed reports in
 the Web browser if any errors occur.  If you'd rather not show the guts of your
 program to users of your script, you can have the reports saved to files
-instead, with something like this::
-
-   import cgitb
+instead, with a line like this::
 
-   cgitb.enable(display=0, logdir="/tmp")
+   import cgitb; cgitb.enable(display=0, logdir="/tmp")
 
 It's very helpful to use this feature during script development. The reports
 produced by :mod:`cgitb` provide information that can save you a lot of time in

Modified: python/trunk/Doc/library/configparser.rst
==============================================================================
--- python/trunk/Doc/library/configparser.rst	(original)
+++ python/trunk/Doc/library/configparser.rst	Fri Feb 20 04:31:23 2009
@@ -231,8 +231,7 @@
    load the required file or files using :meth:`readfp` before calling :meth:`read`
    for any optional files::
 
-      import ConfigParser
-      import os
+      import ConfigParser, os
 
       config = ConfigParser.ConfigParser()
       config.readfp(open('defaults.cfg'))

Modified: python/trunk/Doc/library/cookielib.rst
==============================================================================
--- python/trunk/Doc/library/cookielib.rst	(original)
+++ python/trunk/Doc/library/cookielib.rst	Fri Feb 20 04:31:23 2009
@@ -747,8 +747,7 @@
 
 The first example shows the most common usage of :mod:`cookielib`::
 
-   import cookielib
-   import urllib2
+   import cookielib, urllib2
    cj = cookielib.CookieJar()
    opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
    r = opener.open("http://example.com/")
@@ -756,9 +755,7 @@
 This example illustrates how to open a URL using your Netscape, Mozilla, or Lynx
 cookies (assumes Unix/Netscape convention for location of the cookies file)::
 
-   import cookielib
-   import os
-   import urllib2
+   import os, cookielib, urllib2
    cj = cookielib.MozillaCookieJar()
    cj.load(os.path.join(os.environ["HOME"], ".netscape/cookies.txt"))
    opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))

Modified: python/trunk/Doc/library/crypt.rst
==============================================================================
--- python/trunk/Doc/library/crypt.rst	(original)
+++ python/trunk/Doc/library/crypt.rst	Fri Feb 20 04:31:23 2009
@@ -45,9 +45,7 @@
 
 A simple example illustrating typical use::
 
-   import crypt
-   import getpass
-   import pwd
+   import crypt, getpass, pwd
 
    def login():
        username = raw_input('Python login:')

Modified: python/trunk/Doc/library/csv.rst
==============================================================================
--- python/trunk/Doc/library/csv.rst	(original)
+++ python/trunk/Doc/library/csv.rst	Fri Feb 20 04:31:23 2009
@@ -460,8 +460,7 @@
 
 A slightly more advanced use of the reader --- catching and reporting errors::
 
-   import csv
-   import sys
+   import csv, sys
    filename = "some.csv"
    reader = csv.reader(open(filename, "rb"))
    try:
@@ -507,9 +506,7 @@
 parameter in their constructor and make sure that the data passes the real
 reader or writer encoded as UTF-8::
 
-   import codecs
-   import cStringIO
-   import csv
+   import csv, codecs, cStringIO
 
    class UTF8Recoder:
        """

Modified: python/trunk/Doc/library/difflib.rst
==============================================================================
--- python/trunk/Doc/library/difflib.rst	(original)
+++ python/trunk/Doc/library/difflib.rst	Fri Feb 20 04:31:23 2009
@@ -708,11 +708,7 @@
 
    """
 
-   import difflib
-   import os
-   import optparse
-   import sys
-   import time
+   import sys, os, time, difflib, optparse
 
    def main():
         # Configure the option parser

Modified: python/trunk/Doc/library/doctest.rst
==============================================================================
--- python/trunk/Doc/library/doctest.rst	(original)
+++ python/trunk/Doc/library/doctest.rst	Fri Feb 20 04:31:23 2009
@@ -951,11 +951,9 @@
 test suites from modules and text files containing doctests.  These test suites
 can then be run using :mod:`unittest` test runners::
 
-   import doctest
    import unittest
-
-   import my_module_with_doctests
-   import my_other_module_with_doctests
+   import doctest
+   import my_module_with_doctests, and_another
 
    suite = unittest.TestSuite()
    for mod in my_module_with_doctests, and_another:

Modified: python/trunk/Doc/library/fcntl.rst
==============================================================================
--- python/trunk/Doc/library/fcntl.rst	(original)
+++ python/trunk/Doc/library/fcntl.rst	Fri Feb 20 04:31:23 2009
@@ -133,9 +133,7 @@
 
 Examples (all on a SVR4 compliant system)::
 
-   import fcntl
-   import os
-   import struct
+   import struct, fcntl, os
 
    f = open(...)
    rv = fcntl.fcntl(f, fcntl.F_SETFL, os.O_NDELAY)

Modified: python/trunk/Doc/library/getopt.rst
==============================================================================
--- python/trunk/Doc/library/getopt.rst	(original)
+++ python/trunk/Doc/library/getopt.rst	Fri Feb 20 04:31:23 2009
@@ -114,8 +114,7 @@
 
 In a script, typical usage is something like this::
 
-   import getopt
-   import sys
+   import getopt, sys
 
    def main():
        try:

Modified: python/trunk/Doc/library/gl.rst
==============================================================================
--- python/trunk/Doc/library/gl.rst	(original)
+++ python/trunk/Doc/library/gl.rst	Fri Feb 20 04:31:23 2009
@@ -124,9 +124,7 @@
 
 Here is a tiny but complete example GL program in Python::
 
-   import gl
-   import GL
-   import time
+   import gl, GL, time
 
    def main():
        gl.foreground()

Modified: python/trunk/Doc/library/imaplib.rst
==============================================================================
--- python/trunk/Doc/library/imaplib.rst	(original)
+++ python/trunk/Doc/library/imaplib.rst	Fri Feb 20 04:31:23 2009
@@ -521,8 +521,7 @@
 Here is a minimal example (without error checking) that opens a mailbox and
 retrieves and prints all messages::
 
-   import getpass
-   import imaplib
+   import getpass, imaplib
 
    M = imaplib.IMAP4()
    M.login(getpass.getuser(), getpass.getpass())

Modified: python/trunk/Doc/library/imputil.rst
==============================================================================
--- python/trunk/Doc/library/imputil.rst	(original)
+++ python/trunk/Doc/library/imputil.rst	Fri Feb 20 04:31:23 2009
@@ -112,9 +112,7 @@
 
 ::
 
-   import __builtin__
-   import imp
-   import sys
+   import sys, imp, __builtin__
 
    # Replacement for __import__()
    def import_hook(name, globals=None, locals=None, fromlist=None):

Modified: python/trunk/Doc/library/logging.rst
==============================================================================
--- python/trunk/Doc/library/logging.rst	(original)
+++ python/trunk/Doc/library/logging.rst	Fri Feb 20 04:31:23 2009
@@ -1347,8 +1347,7 @@
 the receiving end. A simple way of doing this is attaching a
 :class:`SocketHandler` instance to the root logger at the sending end::
 
-   import logging
-   import logging.handlers
+   import logging, logging.handlers
 
    rootLogger = logging.getLogger('')
    rootLogger.setLevel(logging.DEBUG)
@@ -2601,9 +2600,7 @@
 configuration::
 
     #!/usr/bin/env python
-    import socket
-    import struct
-    import sys
+    import socket, sys, struct
 
     data_to_send = open(sys.argv[1], "r").read()
 

Modified: python/trunk/Doc/library/modulefinder.rst
==============================================================================
--- python/trunk/Doc/library/modulefinder.rst	(original)
+++ python/trunk/Doc/library/modulefinder.rst	Fri Feb 20 04:31:23 2009
@@ -64,8 +64,7 @@
 
 The script that is going to get analyzed later on (bacon.py)::
 
-   import itertools
-   import re
+   import re, itertools
 
    try:
        import baconhameggs

Modified: python/trunk/Doc/library/pickle.rst
==============================================================================
--- python/trunk/Doc/library/pickle.rst	(original)
+++ python/trunk/Doc/library/pickle.rst	Fri Feb 20 04:31:23 2009
@@ -708,8 +708,7 @@
 pickle-containing file, you should open the file in binary mode because you
 can't be sure if the ASCII or binary format was used. ::
 
-   import pickle
-   import pprint
+   import pprint, pickle
 
    pkl_file = open('data.pkl', 'rb')
 

Modified: python/trunk/Doc/library/poplib.rst
==============================================================================
--- python/trunk/Doc/library/poplib.rst	(original)
+++ python/trunk/Doc/library/poplib.rst	Fri Feb 20 04:31:23 2009
@@ -182,8 +182,7 @@
 Here is a minimal example (without error checking) that opens a mailbox and
 retrieves and prints all messages::
 
-   import getpass
-   import poplib
+   import getpass, poplib
 
    M = poplib.POP3('localhost')
    M.user(getpass.getuser())

Modified: python/trunk/Doc/library/signal.rst
==============================================================================
--- python/trunk/Doc/library/signal.rst	(original)
+++ python/trunk/Doc/library/signal.rst	Fri Feb 20 04:31:23 2009
@@ -228,8 +228,7 @@
 before opening the file; if the operation takes too long, the alarm signal will
 be sent, and the handler raises an exception. ::
 
-   import os
-   import signal
+   import signal, os
 
    def handler(signum, frame):
        print 'Signal handler called with signal', signum

Modified: python/trunk/Doc/library/sqlite3.rst
==============================================================================
--- python/trunk/Doc/library/sqlite3.rst	(original)
+++ python/trunk/Doc/library/sqlite3.rst	Fri Feb 20 04:31:23 2009
@@ -423,8 +423,7 @@
    Example::
 
       # Convert file existing_db.db to SQL dump file dump.sql
-      import os
-      import sqlite3
+      import sqlite3, os
 
       con = sqlite3.connect('existing_db.db')
       with open('dump.sql', 'w') as f:

Modified: python/trunk/Doc/library/ssl.rst
==============================================================================
--- python/trunk/Doc/library/ssl.rst	(original)
+++ python/trunk/Doc/library/ssl.rst	Fri Feb 20 04:31:23 2009
@@ -481,9 +481,7 @@
 This example connects to an SSL server, prints the server's address and certificate,
 sends some bytes, and reads part of the response::
 
-   import pprint
-   import socket
-   import ssl
+   import socket, ssl, pprint
 
    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
@@ -537,8 +535,7 @@
 You'd open a socket, bind it to a port, call :meth:`listen` on it, then start waiting for clients
 to connect::
 
-   import socket
-   import ssl
+   import socket, ssl
 
    bindsocket = socket.socket()
    bindsocket.bind(('myaddr.mydomain.com', 10023))

Modified: python/trunk/Doc/library/stat.rst
==============================================================================
--- python/trunk/Doc/library/stat.rst	(original)
+++ python/trunk/Doc/library/stat.rst	Fri Feb 20 04:31:23 2009
@@ -139,8 +139,7 @@
 
 Example::
 
-   import os
-   import sys
+   import os, sys
    from stat import *
 
    def walktree(top, callback):

Modified: python/trunk/Doc/library/sunaudio.rst
==============================================================================
--- python/trunk/Doc/library/sunaudio.rst	(original)
+++ python/trunk/Doc/library/sunaudio.rst	Fri Feb 20 04:31:23 2009
@@ -135,13 +135,11 @@
 The audio device supports asynchronous notification of various events, through
 the SIGPOLL signal.  Here's an example of how you might enable this in Python::
 
-   import fcntl
-   import signal
-   import STROPTS
-
    def handle_sigpoll(signum, frame):
        print 'I got a SIGPOLL update'
 
+   import fcntl, signal, STROPTS
+
    signal.signal(signal.SIGPOLL, handle_sigpoll)
    fcntl.ioctl(audio_obj.fileno(), STROPTS.I_SETSIG, STROPTS.S_MSG)
 

Modified: python/trunk/Doc/library/termios.rst
==============================================================================
--- python/trunk/Doc/library/termios.rst	(original)
+++ python/trunk/Doc/library/termios.rst	Fri Feb 20 04:31:23 2009
@@ -91,8 +91,7 @@
 exactly no matter what happens::
 
    def getpass(prompt = "Password: "):
-       import sys
-       import termios
+       import termios, sys
        fd = sys.stdin.fileno()
        old = termios.tcgetattr(fd)
        new = termios.tcgetattr(fd)

Modified: python/trunk/Doc/library/traceback.rst
==============================================================================
--- python/trunk/Doc/library/traceback.rst	(original)
+++ python/trunk/Doc/library/traceback.rst	Fri Feb 20 04:31:23 2009
@@ -145,8 +145,7 @@
 complete implementation of the interpreter loop, refer to the :mod:`code`
 module. ::
 
-   import sys
-   import traceback
+   import sys, traceback
 
    def run_user_code(envdir):
        source = raw_input(">>> ")
@@ -166,8 +165,7 @@
 The following example demonstrates the different ways to print and format the
 exception and traceback::
 
-   import sys
-   import traceback
+   import sys, traceback
 
    def lumberjack():
        bright_side_of_death()

Modified: python/trunk/Doc/library/xmlrpclib.rst
==============================================================================
--- python/trunk/Doc/library/xmlrpclib.rst	(original)
+++ python/trunk/Doc/library/xmlrpclib.rst	Fri Feb 20 04:31:23 2009
@@ -551,8 +551,7 @@
 
 ::
 
-   import httplib
-   import xmlrpclib
+   import xmlrpclib, httplib
 
    class ProxiedTransport(xmlrpclib.Transport):
        def set_proxy(self, proxy):

Modified: python/trunk/Doc/tutorial/interactive.rst
==============================================================================
--- python/trunk/Doc/tutorial/interactive.rst	(original)
+++ python/trunk/Doc/tutorial/interactive.rst	Fri Feb 20 04:31:23 2009
@@ -99,8 +99,7 @@
 enable it in the interpreter's interactive mode, add the following to your
 startup file: [#]_  ::
 
-   import readline
-   import rlcompleter
+   import rlcompleter, readline
    readline.parse_and_bind('tab: complete')
 
 This binds the :kbd:`Tab` key to the completion function, so hitting the

Modified: python/trunk/Doc/tutorial/stdlib2.rst
==============================================================================
--- python/trunk/Doc/tutorial/stdlib2.rst	(original)
+++ python/trunk/Doc/tutorial/stdlib2.rst	Fri Feb 20 04:31:23 2009
@@ -170,8 +170,7 @@
 The following code shows how the high level :mod:`threading` module can run
 tasks in background while the main program continues to run::
 
-   import threading
-   import zipfile
+   import threading, zipfile
 
    class AsyncZip(threading.Thread):
        def __init__(self, infile, outfile):

Modified: python/trunk/Doc/whatsnew/2.6.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.6.rst	(original)
+++ python/trunk/Doc/whatsnew/2.6.rst	Fri Feb 20 04:31:23 2009
@@ -473,8 +473,7 @@
 Finally, the :func:`closing(object)` function returns *object* so that it can be
 bound to a variable, and calls ``object.close`` at the end of the block. ::
 
-   import sys
-   import urllib
+   import urllib, sys
    from contextlib import closing
 
    with closing(urllib.urlopen('http://www.yahoo.com')) as f:
