aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-08-14 12:52:47 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-08-14 12:52:47 -0400
commitdd832d63bdc2c18a5456f41a1d099e59becd0bcb (patch)
tree2251f29c7b23758846e4f49a6686706b8aa0a792
parent064554652d35bfd14eb4787a808d4d27d4f643a1 (diff)
downloadexternal_python_setuptools-dd832d63bdc2c18a5456f41a1d099e59becd0bcb.tar.gz
external_python_setuptools-dd832d63bdc2c18a5456f41a1d099e59becd0bcb.tar.bz2
external_python_setuptools-dd832d63bdc2c18a5456f41a1d099e59becd0bcb.zip
Use absolute_import in svn_utils. Fixes #242.
-rw-r--r--CHANGES.txt7
-rw-r--r--setuptools/svn_utils.py2
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 54284c88..3674383c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
CHANGES
=======
+---
+5.6
+---
+
+* Issue #242: Use absolute imports in svn_utils to avoid issues if the
+ installing package adds an xml module to the path.
+
-----
5.5.1
-----
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 2dcfd899..dadb682a 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
import os
import re
import sys