summaryrefslogtreecommitdiff
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
commit9006b45c2fe2b68a4e7fec5293ce90022baab2a0 (patch)
treefcf0715fbafb7c6c537fd8359103d2bc753c9aa2
parent53c1e973c52d5eac9515619ca6765dc54d41d4cb (diff)
downloadpython-setuptools-bitbucket-9006b45c2fe2b68a4e7fec5293ce90022baab2a0.tar.gz
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