[pypy-commit] pypy default: Merge heads

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r52643:950eab16acf3
Date: 2012-02-19 18:52 +0100
http://bitbucket.org/pypy/pypy/changeset/950eab16acf3/

Log:	Merge heads

diff --git a/pypy/module/test_lib_pypy/test_datetime.py b/pypy/module/test_lib_pypy/test_datetime.py
--- a/pypy/module/test_lib_pypy/test_datetime.py
+++ b/pypy/module/test_lib_pypy/test_datetime.py
@@ -3,7 +3,7 @@
 import py
 
 import time
-import datetime
+from lib_pypy import datetime
 import copy
 import os
 
@@ -43,4 +43,4 @@
     dt = datetime.datetime.utcnow()
     assert type(dt.microsecond) is int
 
-    copy.copy(dt)
\ No newline at end of file
+    copy.copy(dt)