X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.vim%2Fpython%2Fvirtualenv.py;fp=.vim%2Fpython%2Fvirtualenv.py;h=ed46739fb6774130b760abc3caef0a0017d711a5;hp=ca66bf8854095a10d459ace69cf34b4ac63066bd;hb=93c18fafd5df1069242d976e4982c38d74629e17;hpb=ba2498c10865adb89a57d22bf877bbbd8afa671e diff --git a/.vim/python/virtualenv.py b/.vim/python/virtualenv.py index ca66bf8..ed46739 100644 --- a/.vim/python/virtualenv.py +++ b/.vim/python/virtualenv.py @@ -1,22 +1,25 @@ -import sys, os +import sys, os # noqa: E401 multiple imports on one line virtualenv_dir = os.environ.get('VIRTUAL_ENV') if virtualenv_dir: - sys.path.insert(0, virtualenv_dir) - for activate_this in [ - os.path.join(virtualenv_dir, 'bin', 'activate_this.py'), - os.path.join(virtualenv_dir, 'Scripts', 'activate_this.py') - ]: - if not os.path.exists(activate_this): - continue - if sys.version_info[0] == 2: - if os.path.exists( - os.path.join(virtualenv_dir, 'lib', 'python2.7')): - execfile(activate_this, + if ( + (sys.version_info[0] == 2) + and os.path.exists( + os.path.join(virtualenv_dir, 'lib', 'python2.7')) + ) or ( + not os.path.exists( + os.path.join(virtualenv_dir, 'lib', 'python2.7')) + ): + for activate_this in [ + os.path.join(virtualenv_dir, 'bin', 'activate_this.py'), + os.path.join(virtualenv_dir, 'Scripts', 'activate_this.py') + ]: + if not os.path.exists(activate_this): + continue + if sys.version_info[0] == 2: + execfile(activate_this, # noqa: F821 undefined name 'execfile' dict(__file__=activate_this)) - else: - if not os.path.exists( - os.path.join(virtualenv_dir, 'lib', 'python2.7')): + else: exec(open(activate_this, 'r').read(), dict(__file__=activate_this)) - break + break