Move check for import of drawing package to drawing/__init__.py.

Update drawing package syntax for 3.x even though most of that won't
work util the package dependencies are updated.  Skip tests if using Python3.

--HG--
extra : convert_revision : svn%3A3ed01bd8-26fb-0310-9e4c-ca1a4053419f/networkx/trunk%401844

1 files changed, 2 insertions, 10 deletions

diff --git a/networkx/__init__.py b/networkx/__init__.py
index 1319043d..d7983161 100644
--- a/networkx/__init__.py
+++ b/networkx/__init__.py
@@ -79,16 +79,8 @@ from networkx.linalg import *
 from networkx.tests.test import run as test
 import networkx.utils
 
-# parts of these packages work with Python >= 2.6 
-
-# These packages need 2.6 <= Python < 3.0
-if sys.version_info[:2] < (3, 0):
-    from drawing import *
-    import drawing
-else:
-    import warnings
-    warnings.warn("""Python version %s detected. 
-Not all functionality enabled""" % sys.version)
+import networkx.drawing
+from networkx.drawing import *
 
 del sys