From f0ad641628a3ddc4e1c208e481b9cd0e9304dc3d Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Sat, 2 Jan 2016 06:44:06 -0500
Subject: [PATCH] Fixed #26016 -- Restored contrib.auth hashers compatibility
 with py-bcrypt.

Reverted "Explicitly passed rounds as rounds to bcrypt.gensalt()"

This reverts commit 23529fb19594ffcc6ba6d716356b828157200288.
---
 django/contrib/auth/hashers.py | 2 +-
 docs/releases/1.9.1.txt        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
index 1a9ca4bd3e..74717c0c5c 100644
--- a/django/contrib/auth/hashers.py
+++ b/django/contrib/auth/hashers.py
@@ -286,7 +286,7 @@ class BCryptSHA256PasswordHasher(BasePasswordHasher):
 
     def salt(self):
         bcrypt = self._load_library()
-        return bcrypt.gensalt(rounds=self.rounds)
+        return bcrypt.gensalt(self.rounds)
 
     def encode(self, password, salt):
         bcrypt = self._load_library()
diff --git a/docs/releases/1.9.1.txt b/docs/releases/1.9.1.txt
index a01eb09d19..46e4f25807 100644
--- a/docs/releases/1.9.1.txt
+++ b/docs/releases/1.9.1.txt
@@ -76,3 +76,6 @@ Bugfixes
 
 * Made ``loaddata`` skip disabling and enabling database constraints when it
   doesn't load any fixtures (:ticket:`23372`).
+
+* Restored ``contrib.auth`` hashers compatibility with py-bcrypt
+  (:ticket:`26016`).