From a1c00f2b4315df7fac1fc25b342ae17685b665aa Mon Sep 17 00:00:00 2001
From: Mike Dirolf <mike@10gen.com>
Date: Fri, 4 Dec 2009 10:41:22 -0500
Subject: [PATCH] minor: these constants make more sense in grid_file.py

---
 gridfs/grid_file.py    | 12 +++++++++---
 pymongo/__init__.py    | 10 ----------
 test/test_grid_file.py |  3 +--
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/gridfs/grid_file.py b/gridfs/grid_file.py
index 12a118485..8aee4f75b 100644
--- a/gridfs/grid_file.py
+++ b/gridfs/grid_file.py
@@ -24,9 +24,6 @@ try:
 except:
     from StringIO import StringIO
 
-from pymongo import _SEEK_SET
-from pymongo import _SEEK_CUR
-from pymongo import _SEEK_END
 from pymongo.son import SON
 from pymongo.database import Database
 from pymongo.objectid import ObjectId
@@ -35,6 +32,15 @@ from pymongo.binary import Binary
 from errors import CorruptGridFile
 from pymongo import ASCENDING
 
+try:
+    _SEEK_SET = os.SEEK_SET
+    _SEEK_CUR = os.SEEK_CUR
+    _SEEK_END = os.SEEK_END
+except AttributeError: # before 2.5
+    _SEEK_SET = 0
+    _SEEK_CUR = 1
+    _SEEK_END = 2
+
 # TODO we should use per-file reader-writer locks here instead,
 # for performance. Unfortunately they aren't in the Python standard library.
 _files_lock = Condition()
diff --git a/pymongo/__init__.py b/pymongo/__init__.py
index 200583824..1bf9be9d7 100644
--- a/pymongo/__init__.py
+++ b/pymongo/__init__.py
@@ -16,7 +16,6 @@
 
 import types
 import sys
-import os
 
 from pymongo.connection import Connection as PyMongo_Connection
 from pymongo.son import SON
@@ -39,15 +38,6 @@ version = "1.1.2+"
 Connection = PyMongo_Connection
 """Alias for :class:`pymongo.connection.Connection`."""
 
-try:
-    _SEEK_SET = os.SEEK_SET
-    _SEEK_CUR = os.SEEK_CUR
-    _SEEK_END = os.SEEK_END
-except AttributeError: # before 2.5
-    _SEEK_SET = 0
-    _SEEK_CUR = 1
-    _SEEK_END = 2
-
 def _index_list(key_or_list, direction=None):
     """Helper to generate a list of (key, direction) pairs.
 
diff --git a/test/test_grid_file.py b/test/test_grid_file.py
index 61fc8e7d3..a28b970aa 100644
--- a/test/test_grid_file.py
+++ b/test/test_grid_file.py
@@ -23,8 +23,7 @@ sys.path[0:0] = [""]
 
 import qcheck
 from test_connection import get_connection
-from gridfs.grid_file import GridFile
-from pymongo import _SEEK_END, _SEEK_CUR
+from gridfs.grid_file import GridFile, _SEEK_END, _SEEK_CUR
 
 
 class TestGridFile(unittest.TestCase):