rebase on master

Yobmod · Yobmod · commit 9562ae2e2436 · 2021-03-16T19:16:19.000Z
diff --git a/doc/source/changes.rst b/doc/source/changes.rst
@@ -2,7 +2,12 @@
 Changelog
 =========
 
-3.1.??
+3.1.15 (UNRELEASED)
+===================
+
+* add deprectation warning for python 3.5
+
+3.1.14
 ======
 
 * git.Commit objects now have a ``replace`` method that will return a
diff --git a/git/cmd.py b/git/cmd.py
@@ -19,6 +19,7 @@
 import threading
 from collections import OrderedDict
 from textwrap import dedent
+import warnings
 
 from git.compat import (
     defenc,
@@ -902,8 +903,14 @@ def transform_kwarg(self, name, value, split_single_char_options):
 
     def transform_kwargs(self, split_single_char_options=True, **kwargs):
         """Transforms Python style kwargs into git command line options."""
+        # Python 3.6 preserves the order of kwargs and thus has a stable
+        # order. For older versions sort the kwargs by the key to get a stable
+        # order.
+        if sys.version_info[:2] < (3, 6):
+            kwargs = OrderedDict(sorted(kwargs.items(), key=lambda x: x[0]))
+            warnings.warn("Python 3.5 support is deprecated and will be removed 2021-09-05.\n" +
+                          "It does not preserve the order for key-word arguments and enforce lexical sorting instead.")
         args = []
-        kwargs = OrderedDict(sorted(kwargs.items(), key=lambda x: x[0]))
         for k, v in kwargs.items():
             if isinstance(v, (list, tuple)):
                 for value in v:
