diff options
author | Mike Frysinger <vapier@google.com> | 2019-08-27 00:26:15 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2019-08-27 07:08:52 +0000 |
commit | 8a11f6f24cecac28e7cdb3f5d0d7c83aec0df017 (patch) | |
tree | dc1e4815412030e99566be30a4b2a6c2ee6d03ea /git_config.py | |
parent | 898f4e6217ff6d848091f69ef64a10269c9da1cd (diff) | |
download | git-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.py | 2 |
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: | |||
44 | from signal import SIGTERM | 44 | from signal import SIGTERM |
45 | from error import GitError, UploadError | 45 | from error import GitError, UploadError |
46 | import platform_utils | 46 | import platform_utils |
47 | from trace import Trace | 47 | from repo_trace import Trace |
48 | if is_python3(): | 48 | if is_python3(): |
49 | from http.client import HTTPException | 49 | from http.client import HTTPException |
50 | else: | 50 | else: |