From 3d28fa76065d2f5cb54f5c90cb44230a36f7ee79 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Mon, 16 Oct 2017 14:31:35 +0200 Subject: [PATCH] Make a copy of six to prevent incompatibility with user six (PY-24509) --- python/helpers/profiler/{six.py => prof_six.py} | 0 python/helpers/profiler/vmprof_profiler.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename python/helpers/profiler/{six.py => prof_six.py} (100%) diff --git a/python/helpers/profiler/six.py b/python/helpers/profiler/prof_six.py similarity index 100% rename from python/helpers/profiler/six.py rename to python/helpers/profiler/prof_six.py diff --git a/python/helpers/profiler/vmprof_profiler.py b/python/helpers/profiler/vmprof_profiler.py index 2157055a1d7d..abe208ffdd5f 100644 --- a/python/helpers/profiler/vmprof_profiler.py +++ b/python/helpers/profiler/vmprof_profiler.py @@ -3,7 +3,7 @@ import shutil import tempfile import vmprof -import six +import prof_six as six from _prof_imports import TreeStats, CallTreeStat