hoist contents of csv submodule up to the package level

diff --git a/Lib/csv/__init__.py b/Lib/csv/__init__.py
index 8b137891791fe96927ad78e64b0aad7bded08bdc..b1b973b55fb658e7348d62f75e2ecfe7d85ecb5e 100644 (file)
--- a/Lib/csv/__init__.py
+++ b/Lib/csv/__init__.py
@@ -1 +1,2 @@
+from csv import *
 

diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index be9726fe7d426053c52250b2997cb20558896047..7ee1facb2ffc48f8cfc33e9b048b6301a152618a 100644 (file)
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -4,7 +4,7 @@
 import sys
 import unittest
 from StringIO import StringIO
-from csv import csv
+import csv
 import gc
 from test.test_support import verbose