Merge pull request #150 from mhagger/python2-is-dead-long-live-python2

Mention python3 first, python2 second

Author: mhagger

README.rst

@@ -59,12 +59,12 @@ Requirements
 
 * A Python interpreter; either
 
+  * Python 3.x, version 3.3 or later.
+
   * Python 2.x, version 2.6 or later.  If you are using Python
     2.6.x, then you have to install the ``argparse`` module yourself,
     as it was only added to the standard library in Python 2.7.
 
-  * Python 3.x, version 3.3 or later.
-
 * A recent version of Git.
 
 Bash completion requires Git's completion being available.

gitimerge.py

@@ -243,21 +243,21 @@ def communicate(process, input=None):
     return (output, error)
 
 
-if sys.hexversion < 0x03000000:
-    # In Python 2.x, os.environ keys and values must be byte
+if sys.hexversion >= 0x03000000:
+    # In Python 3.x, os.environ keys and values must be unicode
     # strings:
     def env_encode(s):
-        """Encode unicode keys or values for use in os.environ."""
+        """Use unicode keys or values unchanged in os.environ."""
 
-        return s.encode(PREFERRED_ENCODING)
+        return s
 
 else:
-    # In Python 3.x, os.environ keys and values must be unicode
+    # In Python 2.x, os.environ keys and values must be byte
     # strings:
     def env_encode(s):
-        """Use unicode keys or values unchanged in os.environ."""
+        """Encode unicode keys or values for use in os.environ."""
 
-        return s
+        return s.encode(PREFERRED_ENCODING)
 
 
 class UncleanWorkTreeError(Failure):