Restore alphabetic order. Also try to import rlcompleter and curses, but

don't fail if they're not available.

1 files changed, 15 insertions, 7 deletions

diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py
index a2843a7f..bb4159c 100644
--- a/Lib/test/test_sundry.py
+++ b/Lib/test/test_sundry.py
@@ -1,5 +1,7 @@
 """Do a minimal test of all the modules that aren't otherwise tested."""
 
+from test_support import verbose
+
 import BaseHTTPServer
 import CGIHTTPServer
 import Queue
@@ -17,7 +19,11 @@ import codeop
 import colorsys
 import commands
 import compileall
-#import curses
+try:
+    import curses   # not available on Windows
+except ImportError:
+    if verbose:
+        print "skipping curses"
 import dbhash
 import dircache
 import dis
@@ -64,7 +70,11 @@ import py_compile
 import pyclbr
 #import reconvert
 import repr
-#import rlcompleter
+try:
+    import rlcompleter   # not available on Windows
+except ImportError:
+    if verbose:
+        print "skipping rlcompleter"
 import robotparser
 import sched
 import sgmllib
@@ -85,13 +95,11 @@ import test
 import toaiff
 #import tzparse
 import urllib2
+# Can't test the "user" module -- if the user has a ~/.pythonrc.py, it
+# can screw up all sorts of things (esp. if it prints!).
+#import user
 import uu
 import webbrowser
 import whichdb
 import xdrlib
 import xml
-
-# Can't test the "user" module -- if the user has a ~/.pythonrc.py, it
-# can screw up all sorts of things (esp. if it prints!).
-#
-#import user