commit 2f6ab7f5b8f21b2dbfe9ae102674bd1694e94f03
author Mickaël Salaün <mic@digikod.net> Sun Sep 30 00:37:55 2012 +0200
committer Mickaël Salaün <mic@digikod.net> Wed Oct 10 08:30:15 2012 +0200
tree 040f9045751d83902ea8c479304fdfa2a0061a54
parent 3a6cd4200e42fbb5a21b3fb8d3c9738c0320cc63

Rename "dir" variables

The variable name "dir" conflicts with the name of a Python built-in
function: http://docs.python.org/library/functions.html#dir

Change-Id: I850f3ec8df7563dc85e21f2876fe5e6550ca2d8f

git_command.py

diff --git a/git_command.py b/git_command.py
index 5988cc2..82709b9 100644
--- a/git_command.py
+++ b/git_command.py
@@ -37,11 +37,11 @@
   if _ssh_sock_path is None:
     if not create:
       return None
-    dir = '/tmp'
-    if not os.path.exists(dir):
-      dir = tempfile.gettempdir()
+    tmp_dir = '/tmp'
+    if not os.path.exists(tmp_dir):
+      tmp_dir = tempfile.gettempdir()
     _ssh_sock_path = os.path.join(
-      tempfile.mkdtemp('', 'ssh-', dir),
+      tempfile.mkdtemp('', 'ssh-', tmp_dir),
       'master-%r@%h:%p')
   return _ssh_sock_path