change sys.path unconditionally to work around people who have the egg installed

test/qcheck.py

@@ -13,16 +13,12 @@
 # limitations under the License.
 
 import random
-import sys
 import traceback
 import datetime
 import re
 import types
-
-try:
-    import pymongo
-except ImportError:
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 from pymongo.binary import Binary
 from pymongo.objectid import ObjectId

test/test_binary.py

@@ -15,12 +15,8 @@
 """Tests for the Binary wrapper."""
 
 import unittest
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 from pymongo import binary
 

test/test_bson.py

@@ -21,10 +21,7 @@ import glob
 import sys
 import types
 
-try:
-    import pymongo
-except ImportError:
-    sys.path[0:0] = [""]
+sys.path[0:0] = [""]
 
 import qcheck
 from pymongo.binary import Binary

test/test_collection.py

@@ -14,12 +14,8 @@
 
 """Test the collection module."""
 import unittest
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 import qcheck
 from test_connection import get_connection

test/test_connection.py

@@ -16,12 +16,8 @@
 
 import unittest
 import os
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 from pymongo.errors import ConnectionFailure, InvalidName
 from pymongo.database import Database

test/test_cursor.py

@@ -16,12 +16,8 @@
 import unittest
 import types
 import random
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 from pymongo.errors import InvalidOperation
 from pymongo.cursor import Cursor

test/test_database.py

@@ -18,12 +18,8 @@ import unittest
 import types
 import random
 import datetime
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 from pymongo.errors import InvalidName, InvalidOperation, CollectionInvalid, OperationFailure
 from pymongo.son import SON

test/test_dbref.py

@@ -16,12 +16,8 @@
 
 import unittest
 import types
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 from pymongo.objectid import ObjectId
 from pymongo.dbref import DBRef

test/test_grid_file.py

@@ -17,12 +17,8 @@
 
 import unittest
 import datetime
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 import qcheck
 from test_connection import get_connection

test/test_gridfs.py

@@ -16,12 +16,8 @@
 """
 
 import unittest
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 import gridfs
 from test_connection import get_connection

test/test_mongo.py

@@ -18,12 +18,8 @@ import unittest
 import random
 import types
 import os
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 from pymongo.objectid import ObjectId
 from pymongo.dbref import DBRef

test/test_objectid.py

@@ -15,12 +15,8 @@
 """Tests for the objectid module."""
 
 import unittest
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 from pymongo.objectid import ObjectId
 from pymongo.errors import InvalidId

test/test_paired.py

@@ -24,12 +24,8 @@ localhost:27017 and localhost:27018 by default.
 import unittest
 import logging
 import os
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 from pymongo.errors import ConnectionFailure, ConfigurationError
 from pymongo.connection import Connection

test/test_son.py

@@ -17,12 +17,8 @@
 import unittest
 import datetime
 import re
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 from pymongo.objectid import ObjectId
 from pymongo.dbref import DBRef

test/test_son_manipulator.py

@@ -16,12 +16,8 @@
 """
 
 import unittest
-
-try:
-    import pymongo
-except ImportError:
-    import sys
-    sys.path[0:0] = [""]
+import sys
+sys.path[0:0] = [""]
 
 import qcheck
 from pymongo.objectid import ObjectId