summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-05-26 09:13:56 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-05-26 09:13:56 +0200
commit8486f2d2e5c251d0fa891235a692fa8b1a440a89 (patch)
tree9f59f23d4eb99d911c50b157fb93ef4f83a07f18
parent1537aabfa3bb32199e321766793c87864f36ee9a (diff)
parent9989f8965f34af5009361ec58f80bbf3ca75b465 (diff)
downloadgitpython-8486f2d2e5c251d0fa891235a692fa8b1a440a89.tar.gz
Merge pull request #443 from boegel/fix_ordereddict
import OrderedDict from git.odict rather than directly from collections, to pix Py2.6 compatibility
-rw-r--r--git/cmd.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/cmd.py b/git/cmd.py
index eef52534..bbbed62f 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -13,7 +13,7 @@ import threading
import errno
import mmap
-from collections import OrderedDict
+from git.odict import OrderedDict
from contextlib import contextmanager
import signal