use builtin print function when possible

2 files changed, 7 insertions, 12 deletions

diff --git a/six.py b/six.py
index 860d506..d972faf 100644
--- a/six.py
+++ b/six.py
@@ -481,8 +481,7 @@ _add_doc(u, """Text literal""")
 
 
 if PY3:
-    import builtins
-    exec_ = getattr(builtins, "exec")
+    exec_ = getattr(moves.builtins, "exec")
 
 
     def reraise(tp, value, tb=None):
@@ -490,10 +489,6 @@ if PY3:
             raise value.with_traceback(tb)
         raise value
 
-
-    print_ = getattr(builtins, "print")
-    del builtins
-
 else:
     def exec_(_code_, _globs_=None, _locs_=None):
         """Execute code in a namespace."""
@@ -513,18 +508,18 @@ else:
 """)
 
 
+print_ = getattr(moves.builtins, "print", None)
+if print_ is None:
     def print_(*args, **kwargs):
-        """The new-style print function."""
+        """The new-style print function for Python 2.4 and 2.5."""
         fp = kwargs.pop("file", sys.stdout)
         if fp is None:
             return
         def write(data):
             if not isinstance(data, basestring):
                 data = str(data)
-            # If the file has an encoding, encode unicode with it. In Python
-            # 2.7, file.write handles this.
-            if (sys.version_info[1] < 7 and
-                isinstance(fp, file) and
+            # If the file has an encoding, encode unicode with it.
+            if (isinstance(fp, file) and
                 isinstance(data, unicode) and
                 fp.encoding is not None):
                 errors = getattr(fp, "errors", None)
diff --git a/test_six.py b/test_six.py
index 37fa6fa..feabd73 100644
--- a/test_six.py
+++ b/test_six.py
@@ -528,7 +528,7 @@ def test_print_():
     assert out.getvalue() == "None\n"
 
 
-@py.test.mark.skipif("sys.version_info[:2] >= (2, 7)")
+@py.test.mark.skipif("sys.version_info[:2] >= (2, 6)")
 def test_print_encoding(monkeypatch):
     # Fool the type checking print_.
     monkeypatch.setattr(six, "file", six.BytesIO, raising=False)