Updated import statements to use the new `configparser` module name.
Updated the documentation to use the new name.
Revert addition of the stub entry for the old name.
Georg, I am reverting your changes since this commit should propagate
to py3k.
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index daf6811..ecc06f0 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -10,7 +10,7 @@
import os
import socket
import platform
-import ConfigParser
+import configparser
import httplib
import base64
import urlparse