Merge changes I079bd2da,Idd49f134,I29c21d25,I7bbf0403 into nyc-mr1-dev
* changes:
Fix Formatting And Syntax Issues with tel_test_utils.WiFiUtils
Error Check the Airplane Mode Setting in setup_iwlan
Improve the consistency of hanging up calls
Update File Formatting with YAPF
diff --git a/acts/framework/setup.py b/acts/framework/setup.py
index 1742515..849dfdc 100755
--- a/acts/framework/setup.py
+++ b/acts/framework/setup.py
@@ -17,7 +17,6 @@
from distutils import cmd
from distutils import log
import os
-import pip
import shutil
import setuptools
from setuptools.command import test
@@ -72,6 +71,8 @@
pass
def run(self):
+ import pip
+
required_packages = self.distribution.install_requires
for package in required_packages:
@@ -114,6 +115,10 @@
"""Entry point for the uninstaller."""
# Remove the working directory from the python path. This ensures that
# Source code is not accidently tarageted.
+ our_dir = os.path.abspath(os.path.dirname(__file__))
+ if our_dir in sys.path:
+ sys.path.remove(our_dir)
+
if os.getcwd() in sys.path:
sys.path.remove(os.getcwd())
