From 9edafa21677c5635e763a275b9efe5f86cf6df95 Mon Sep 17 00:00:00 2001
From: Mike Dirolf <mike@10gen.com>
Date: Wed, 25 Feb 2009 17:42:03 -0500
Subject: [PATCH] make sure we're using utc

---
 examples/simple_demo.py | 2 +-
 gridfs/grid_file.py     | 2 +-
 test/test_grid_file.py  | 2 +-
 tools/benchmark.py      | 2 +-
 tools/driver_tests.py   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/simple_demo.py b/examples/simple_demo.py
index 65ec7c4d6..6107893cb 100644
--- a/examples/simple_demo.py
+++ b/examples/simple_demo.py
@@ -54,7 +54,7 @@ db.pymongo.insert({"x": 20, "y": 100})
 db.pymongo.insert({"greeting": True, "hello": u"world"})
 
 # floats and dates.
-db.pymongo.insert({"name": u"mike", "account balance": 0.01, "time": datetime.datetime.now()})
+db.pymongo.insert({"name": u"mike", "account balance": 0.01, "time": datetime.datetime.utcnow()})
 
 # The find_one method returns a single document, or None.
 doc = db.pymongo.find_one({"x": 20})
diff --git a/gridfs/grid_file.py b/gridfs/grid_file.py
index 092f26cce..ad25b9bb3 100644
--- a/gridfs/grid_file.py
+++ b/gridfs/grid_file.py
@@ -88,7 +88,7 @@ class GridFile(object):
             if mode == "r":
                 raise IOError("No such file: %r" % file_spec)
             file_spec["length"] = 0
-            file_spec["uploadDate"] = datetime.datetime.now()
+            file_spec["uploadDate"] = datetime.datetime.utcnow()
             file_spec.setdefault("chunkSize", 256000)
             self.__id = self.__collection.files.insert(file_spec)["_id"]
 
diff --git a/test/test_grid_file.py b/test/test_grid_file.py
index 620a0f455..364636c7c 100644
--- a/test/test_grid_file.py
+++ b/test/test_grid_file.py
@@ -175,7 +175,7 @@ class TestGridFile(unittest.TestCase):
         self.assertRaises(AttributeError, set_chunk_size)
 
         def set_upload_date():
-            a.upload_date = datetime.datetime.now()
+            a.upload_date = datetime.datetime.utcnow()
         self.assertRaises(AttributeError, set_upload_date)
 
         a.aliases = ["hello", "world"]
diff --git a/tools/benchmark.py b/tools/benchmark.py
index aca3518f3..6f23e8923 100644
--- a/tools/benchmark.py
+++ b/tools/benchmark.py
@@ -36,7 +36,7 @@ medium = {"integer": 5,
 # this is similar to the benchmark data posted to the user list
 large = {"base_url": "http://www.example.com/test-me",
          "total_word_count": 6743,
-         "access_time": datetime.datetime.now(),
+         "access_time": datetime.datetime.utcnow(),
          "meta_tags": {"description": "i am a long description string",
                        "author": "Holly Man",
                        "dynamically_created_meta_tag": "who know\n what"
diff --git a/tools/driver_tests.py b/tools/driver_tests.py
index 9093a9b03..3a78cf1b4 100755
--- a/tools/driver_tests.py
+++ b/tools/driver_tests.py
@@ -123,7 +123,7 @@ def remove(db, out):
 def stress1(db, out):
     for i in range(50000):
         db.stress1.save({"name": "asdf" + str(i),
-                         "date": datetime.datetime.now(),
+                         "date": datetime.datetime.utcnow(),
                          "id": i,
                          "blah": "lksjhasoh1298a1shasoidiohaskjasiouashoasasiugoas" +
                          "lksjhasoh1298a1shasoidiohaskjasiouashoasasiugoas" +