From 4b08a42fe8f76cc2bb626f210d6c8ee669fa7ca0 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Mon, 30 Jan 2017 16:05:52 +0100
Subject: [PATCH] Update tools.py - A variable in zc.buildout has been renamed.
zc.buildout.easy_install.setuptools_loc ->
zc.buildout.easy_install.setuptools_path
---
bob/buildout/tools.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/bob/buildout/tools.py b/bob/buildout/tools.py
index 98c6970..1110be9 100644
--- a/bob/buildout/tools.py
+++ b/bob/buildout/tools.py
@@ -238,8 +238,10 @@ def get_pythonpath(working_set, buildout, prefixes):
if hasattr(zc.buildout.easy_install, 'distribute_loc'):
prepend_path(zc.buildout.easy_install.distribute_loc, paths)
- else:
+ elif hasattr(zc.buildout.easy_install, 'setuptools_loc'):
prepend_path(zc.buildout.easy_install.setuptools_loc, paths)
+ else:
+ prepend_path(zc.buildout.easy_install.setuptools_path, paths)
return [k for k in working_set.entries \
if os.path.realpath(k) not in site_paths(buildout, prefixes)]
--
GitLab