summaryrefslogtreecommitdiffstats
path: root/git_config.py
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2019-08-27 00:26:15 -0400
committerMike Frysinger <vapier@google.com>2019-08-27 07:08:52 +0000
commit8a11f6f24cecac28e7cdb3f5d0d7c83aec0df017 (patch)
treedc1e4815412030e99566be30a4b2a6c2ee6d03ea /git_config.py
parent898f4e6217ff6d848091f69ef64a10269c9da1cd (diff)
downloadgit-repo-8a11f6f24cecac28e7cdb3f5d0d7c83aec0df017.tar.gz
rename local trace module
There is a standard Python "trace" module, so having a local trace.py prevents us being able to import that. Rename the module to avoid. Change-Id: I23e29ec95a2204bb168a641323d05e76968d9b57 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/234832 Reviewed-by: David Pursehouse <dpursehouse@collab.net> Tested-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'git_config.py')
-rw-r--r--git_config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git_config.py b/git_config.py
index 9b3dd25a..1ea9c43e 100644
--- a/git_config.py
+++ b/git_config.py
@@ -44,7 +44,7 @@ else:
44from signal import SIGTERM 44from signal import SIGTERM
45from error import GitError, UploadError 45from error import GitError, UploadError
46import platform_utils 46import platform_utils
47from trace import Trace 47from repo_trace import Trace
48if is_python3(): 48if is_python3():
49 from http.client import HTTPException 49 from http.client import HTTPException
50else: 50else: