From 2f6ab7f5b8f21b2dbfe9ae102674bd1694e94f03 Mon Sep 17 00:00:00 2001 From: Mickaël Salaün Date: Sun, 30 Sep 2012 00:37:55 +0200 Subject: 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'git_command.py') diff --git a/git_command.py b/git_command.py index 5988cc28..82709b91 100644 --- a/git_command.py +++ b/git_command.py @@ -37,11 +37,11 @@ def ssh_sock(create=True): 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 -- cgit v1.2.3-54-g00ecf