diff --git a/test/qcheck.py b/test/qcheck.py index 68c66d7f5..cf524874f 100644 --- a/test/qcheck.py +++ b/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 diff --git a/test/test_binary.py b/test/test_binary.py index df7cd9273..b8bb320f3 100644 --- a/test/test_binary.py +++ b/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 diff --git a/test/test_bson.py b/test/test_bson.py index 1345c8d97..795421484 100644 --- a/test/test_bson.py +++ b/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 diff --git a/test/test_collection.py b/test/test_collection.py index 24c509a66..23844add7 100644 --- a/test/test_collection.py +++ b/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 diff --git a/test/test_connection.py b/test/test_connection.py index ceb34d5b6..e8c41f375 100644 --- a/test/test_connection.py +++ b/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 diff --git a/test/test_cursor.py b/test/test_cursor.py index 4afdf33b3..b86aa83d1 100644 --- a/test/test_cursor.py +++ b/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 diff --git a/test/test_database.py b/test/test_database.py index 338be77ca..8953745bf 100644 --- a/test/test_database.py +++ b/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 diff --git a/test/test_dbref.py b/test/test_dbref.py index 26ec07dcd..893ce67fd 100644 --- a/test/test_dbref.py +++ b/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 diff --git a/test/test_grid_file.py b/test/test_grid_file.py index 3db0ee36f..f642f0a0d 100644 --- a/test/test_grid_file.py +++ b/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 diff --git a/test/test_gridfs.py b/test/test_gridfs.py index 91c3a53fd..d160b2d8d 100644 --- a/test/test_gridfs.py +++ b/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 diff --git a/test/test_mongo.py b/test/test_mongo.py index 397ca3bee..84963e41c 100644 --- a/test/test_mongo.py +++ b/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 diff --git a/test/test_objectid.py b/test/test_objectid.py index f7a1e9c97..10f0555ca 100644 --- a/test/test_objectid.py +++ b/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 diff --git a/test/test_paired.py b/test/test_paired.py index 369c71959..a89b16c3d 100644 --- a/test/test_paired.py +++ b/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 diff --git a/test/test_son.py b/test/test_son.py index 16de34081..cac3878ad 100644 --- a/test/test_son.py +++ b/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 diff --git a/test/test_son_manipulator.py b/test/test_son_manipulator.py index 232b00982..178fa5f97 100644 --- a/test/test_son_manipulator.py +++ b/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