[SQL-CVS] r768 - trunk/SQLObject/scripts

[<sub...@co...>]

Author: ianb
Date: 2005-05-05 21:46:28 +0000 (Thu, 05 May 2005)
New Revision: 768

Modified:
   trunk/SQLObject/scripts/sqlobject-admin
Log:
Better handle older versions of SQLObject being installed

Modified: trunk/SQLObject/scripts/sqlobject-admin
===================================================================
--- trunk/SQLObject/scripts/sqlobject-admin	2005-05-05 21:45:21 UTC (rev 767)
+++ trunk/SQLObject/scripts/sqlobject-admin	2005-05-05 21:46:28 UTC (rev 768)
@@ -2,7 +2,7 @@
 import sys
 import os
 try:
-    import sqlobject
+    import sqlobject.manager
 except ImportError:
     try:
         here = __file__
@@ -17,6 +17,11 @@
         print 'I cannot find the sqlobject module'
         print 'If SQLObject is installed, you may need to set $PYTHONPATH'
         sys.exit(3)
+    # Now we have to get rid of possibly stale modules from that import
+    # up there
+    for name, value in sys.modules.items():
+        if name.startswith('sqlobject'):
+            del sys.modules[name]
 
 from sqlobject.manager import command
 command.the_runner.run(sys.argv)