Merge from stable

5 files changed, 25 insertions, 9 deletions

diff --git a/CHANGES b/CHANGES
index 624f529..921961b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -113,6 +113,12 @@ Todo
 
 * Thread safety audit and tests for CryptContext, HasManyBackends, and lazy-init subclasses.
 
+**1.6.5** (2015-08-04)
+======================
+
+   Fixed some minor bugs in the test suite which were causing erroneous test failures
+   (:issue:`57` and :issue:`58`). The passlib library itself is unchanged.
+   
 **1.6.4** (2015-07-25)
 ======================
 
@@ -163,7 +169,7 @@ Other Changes
 
 .. note::
 
-    '1.6.3' was skipped due to upload issues.
+    Release **1.6.3** was skipped due to upload issues.
 
 **1.6.2** (2013-12-26)
 ======================
diff --git a/LICENSE b/LICENSE
index fb594b1..26d718b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ Passlib is (c) `Assurance Technologies <http://www.assurancetechnologies.com>`_,
 and is released under the `BSD license <http://www.opensource.org/licenses/bsd-license.php>`_::
 
     Passlib
-    Copyright (c) 2008-2012 Assurance Technologies, LLC.
+    Copyright (c) 2008-2015 Assurance Technologies, LLC.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
diff --git a/README b/README
index 36b79a7..e7e9c15 100644
--- a/README
+++ b/README
@@ -20,9 +20,8 @@ providing full-strength password hashing for multi-user application.
 
 * Visit `PyPI <https://pypi.python.org/pypi/passlib>`_
   for the latest stable release.
-
-All releases are signed with the gpg key
-`4CE1ED31 <http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x4D8592DF4CE1ED31>`_.
+  All releases are signed with the gpg key
+  `4CE1ED31 <http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x4D8592DF4CE1ED31>`_.
 
 * Additional questions about usage or features? Feel free to post on our
   `mailing list <http://groups.google.com/group/passlib-users>`_.
@@ -51,8 +50,16 @@ This example barely touches on the range of features available.
 Online Resources
 ================
 * Homepage -   https://bitbucket.org/ecollins/passlib
-* Docs -       http://packages.python.org/passlib
-* Discussion - http://groups.google.com/group/passlib-users
+* Documentation - http://packages.python.org/passlib
+* Mailing list - http://groups.google.com/group/passlib-users
 
 * Downloads -  https://pypi.python.org/pypi/passlib
 * Source -     https://bitbucket.org/ecollins/passlib/src
+* Issues -     https://bitbucket.org/ecollins/passlib/issues
+
+Source
+=========
+Passlib's source repository uses Mercurial.  When building Passlib from an hg clone, note that there are two main branches: ``default`` and ``stable``.
+
+* ``default`` is the bleeding edge of the next major release. It may sometimes be of alpha quality. 
+* ``stable`` is the latest released version plus any pending bugfixes, and should be safe to use in production. 
diff --git a/docs/conf.py b/docs/conf.py
index 40f1910..9ddc460 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -94,7 +94,7 @@ index_doc = 'index'
 # General information about the project.
 project = 'Passlib'
 author = "Assurance Technologies, LLC"
-copyright = "2008-2012, " + author
+copyright = "2008-2015, " + author
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/passlib/tests/test_ext_django.py b/passlib/tests/test_ext_django.py
index a4b0ae5..9d0c3e3 100644
--- a/passlib/tests/test_ext_django.py
+++ b/passlib/tests/test_ext_django.py
@@ -2,7 +2,10 @@
 #=============================================================================
 # imports
 #=============================================================================
-from __future__ import with_statement, absolute_import
+# NOTE: double __future__ is workaround for py2.5.0 bug, 
+#       per https://bitbucket.org/ecollins/passlib/issues/58#comment-20589295
+from __future__ import with_statement
+from __future__ import absolute_import
 # core
 import logging; log = logging.getLogger(__name__)
 import sys