Merge 0.6.48 with native Python 3 code

--HG--
branch : distribute

.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

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
 ------

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
 
 ---------------------------

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"
 

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.

pkg_resources.py

@@ -1029,7 +1029,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

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'
 

setup.py

@@ -47,7 +47,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