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
This commit is contained in:
parent
3a6cd4200e
commit
2f6ab7f5b8
5 changed files with 28 additions and 28 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue