Merge with 1.4.2

1 files changed, 17 insertions, 1 deletions

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 08969b7e..664566a3 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -1,9 +1,10 @@
 """Package Index Tests
 """
 import sys
+import os
 import unittest
 import pkg_resources
-from setuptools.compat import urllib2, httplib, HTTPError, unicode
+from setuptools.compat import urllib2, httplib, HTTPError, unicode, pathname2url
 import distutils.errors
 import setuptools.package_index
 from setuptools.tests.server import IndexServer
@@ -151,6 +152,21 @@ class TestPackageIndex(unittest.TestCase):
         self.assertEqual(url, 'https://example.com/bar')
         self.assertEqual(rev, '2995')
 
+    def test_local_index(self):
+        """
+        local_open should be able to read an index from the file system.
+        """
+        f = open('index.html', 'w')
+        f.write('<div>content</div>')
+        f.close()
+        try:
+            url = 'file:' + pathname2url(os.getcwd()) + '/'
+            res = setuptools.package_index.local_open(url)
+        finally:
+            os.remove('index.html')
+        assert 'content' in res.read()
+
+
 class TestContentCheckers(unittest.TestCase):
 
     def test_md5(self):