From 96af0a8db149cc8c45c24c1a9066a71ab1935248 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:39:05 -0400
Subject: Correct AttributeError again (this time verified)

--HG--
branch : distribute
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 844c145d..e0e0c1a3 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1000,7 +1000,7 @@ variable to point to an accessible directory.
         return target_path
 
     @staticmethod
-    def warn_unsafe_extraction_path(path):
+    def _warn_unsafe_extraction_path(path):
         """
         If the default extraction path is overridden and set to an insecure
         location, such as /tmp, it opens up an opportunity for an attacker to
-- 
cgit v1.2.1


From e338182730c76368a994e90357f19dac809bbe00 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:41:42 -0400
Subject: Update changelog

--HG--
branch : distribute
---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3baf6e7a..3efef119 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+0.6.48
+------
+
+* Correct AttributeError in ``ResourceManager.get_cache_path`` introduced in
+  0.6.46 (redo).
+
 ------
 0.6.47
 ------
-- 
cgit v1.2.1


From 3bcd16d6a3f783e53fd8b083c5f9c655a08439fc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:42:29 -0400
Subject: Added tag 0.6.48 for changeset cae9127e0534

--HG--
branch : distribute
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 54dd2171..c52e79df 100644
--- a/.hgtags
+++ b/.hgtags
@@ -57,3 +57,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 b57e5ba934767dd498669b17551678081b3047b5 0.6.46
 ee2c967017024197b38e39ced852808265387a4b 0.6.47
+cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
-- 
cgit v1.2.1


From 132ef1524599896fd97bc1477d86a339bcf51415 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:42:56 -0400
Subject: Bumped to 0.6.49 in preparation for next release.

--HG--
branch : distribute
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index e24506bb..47b42412 100755
--- a/README.txt
+++ b/README.txt
@@ -78,9 +78,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.48.tar.gz
-    $ tar -xzvf distribute-0.6.48.tar.gz
-    $ cd distribute-0.6.48
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.49.tar.gz
+    $ tar -xzvf distribute-0.6.49.tar.gz
+    $ cd distribute-0.6.49
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 112f9202..3553b213 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ except ImportError:
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.48"
+DEFAULT_VERSION = "0.6.49"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 9c9a05f2..4146dcaa 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2009-2011, The fellowship of the packaging'
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.48'
+version = '0.6.49'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.48'
+release = '0.6.49'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index c2584411..59ac9122 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@ try:
 except Exception:
 	pass
 
-VERSION = '0.6.48'
+VERSION = '0.6.49'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index 929c73b9..99291e88 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ exec(init_file.read(), d)
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.48"
+VERSION = "0.6.49"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
-- 
cgit v1.2.1


From b487b362c4c93cc90f0ad783040679ac2cebfdd9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:50:40 -0400
Subject: Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 31d6bc89..2ea4ef42 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.7.7
+-----
+
+* Distribute #375: Repair AttributeError created in last release (redo).
+
 -----
 0.7.6
 -----
-- 
cgit v1.2.1


From 1bc7b7b3dd81a74d4be2bc0c4e95ba8d29dc58d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:55:26 -0400
Subject: Issue #30: Added test for get_cache_path (but it doesn't yet get run)

---
 CHANGES.txt                 | 1 +
 tests/test_pkg_resources.py | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2ea4ef42..b9a9e9f0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 -----
 
 * Distribute #375: Repair AttributeError created in last release (redo).
+* Issue #30: Added test for get_cache_path.
 
 -----
 0.7.6
diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 7009b4ab..6e4a9348 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -59,3 +59,11 @@ class TestZipProvider(object):
 		f = open(filename)
 		assert f.read() == 'hello, world!'
 		manager.cleanup_resources()
+
+class TestResourceManager(object):
+	def test_get_cache_path(self):
+		mgr = pkg_resources.ResourceManager()
+		path = mgr.get_cache_path('foo')
+		type_ = str(type(path))
+		message = "Unexpected type from get_cache_path: " + type_
+		assert isinstance(path, (unicode, str)), message
-- 
cgit v1.2.1


From 178a4ab5c3af80c077572fd01d748084b35844e0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 12:00:35 -0400
Subject: Patched test so it can be run on Python 3

---
 tests/test_pkg_resources.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 6e4a9348..f3256173 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -5,6 +5,11 @@ import zipfile
 
 import pkg_resources
 
+try:
+	unicode
+except NameError:
+	unicode = str
+
 class EggRemover(unicode):
 	def __call__(self):
 		if self in sys.path:
-- 
cgit v1.2.1


From d9b32bd186ce6804fca2df9ece07c2fabb1737e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 12:01:19 -0400
Subject: Added tag 0.7.7 for changeset 1506fa538fff

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 19abdaf7..d3012fe8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -69,3 +69,4 @@ dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5
 ee2c967017024197b38e39ced852808265387a4b 0.6.47
 48d3d26cbea68e21c96e51f01092e8fdead5cd60 0.7.6
 cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
+1506fa538fff01e70424530a32a44e070720cf3c 0.7.7
-- 
cgit v1.2.1


From 83c974c56ebc4689171913da1a6af3249b56ec6d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 12:01:32 -0400
Subject: Bumped to 0.7.8 in preparation for next release.

---
 README.txt             | 8 ++++----
 docs/conf.py           | 4 ++--
 ez_setup.py            | 2 +-
 release.py             | 2 +-
 setup.py               | 2 +-
 setuptools/__init__.py | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index c3d5b3c6..77acd2ba 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.7/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.8/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.7/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.8/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.7/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.8/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7.7$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.7.8$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index a90d8866..8bbf4bea 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2009-2013, The fellowship of the packaging'
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.7'
+version = '0.7.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.7'
+release = '0.7.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 62bc0361..6baa9b99 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@ try:
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7.7"
+DEFAULT_VERSION = "0.7.8"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index a4f72f72..61e6862d 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@ try:
 except Exception:
 	pass
 
-VERSION = '0.7.7'
+VERSION = '0.7.8'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index 9b1c67f7..a4d6d556 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ exec(init_file.read(), d)
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.7"
+VERSION = "0.7.8"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index e93245ab..104ea064 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@ from distutils.util import convert_path
 import os
 import sys
 
-__version__ = '0.7.7'
+__version__ = '0.7.8'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
-- 
cgit v1.2.1