Merge remote-tracking branch 'upstream/master' into extract_http_basic

8 files changed, 13 insertions, 18 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 518f7e784..c3a7170fc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -78,7 +78,7 @@ intersphinx_mapping = {
     'webtest': ('http://webtest.pythonpaste.org/en/latest', None),
     'who': ('http://repozewho.readthedocs.org/en/latest', None),
     'zcml': ('http://docs.pylonsproject.org/projects/pyramid-zcml/en/latest', None),
-    'zcomponent': ('http://docs.zope.org/zope.component', None),
+    'zcomponent': ('http://zopecomponent.readthedocs.io/en/stable/', None),
 }
 
 
diff --git a/docs/quick_tutorial/routing.rst b/docs/quick_tutorial/routing.rst
index 27c8c2c22..d88adfa1e 100644
--- a/docs/quick_tutorial/routing.rst
+++ b/docs/quick_tutorial/routing.rst
@@ -79,7 +79,7 @@ Steps
 
    .. code-block:: bash
 
-    $ $VENV/bin/$VENV/bin/py.test tutorial/tests.py -q
+    $ $VENV/bin/py.test tutorial/tests.py -q
     ..
     2 passed in 0.39 seconds
 
diff --git a/docs/quick_tutorial/static_assets.rst b/docs/quick_tutorial/static_assets.rst
index 65b34f8f9..b8482492d 100644
--- a/docs/quick_tutorial/static_assets.rst
+++ b/docs/quick_tutorial/static_assets.rst
@@ -47,7 +47,7 @@ Steps
 
    .. code-block:: bash
 
-    $ $VENV/bin/$VENV/bin/py.test tutorial/tests.py -q
+    $ $VENV/bin/py.test tutorial/tests.py -q
     ....
     4 passed in 0.50 seconds
 
diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/models/user.py b/docs/tutorials/wiki2/src/authentication/tutorial/models/user.py
index 6fb32a1b2..9228b48f7 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/models/user.py
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/models/user.py
@@ -19,11 +19,10 @@ class User(Base):
 
     def set_password(self, pw):
         pwhash = bcrypt.hashpw(pw.encode('utf8'), bcrypt.gensalt())
-        self.password_hash = pwhash
+        self.password_hash = pwhash.decode('utf8')
 
     def check_password(self, pw):
         if self.password_hash is not None:
             expected_hash = self.password_hash.encode('utf8')
-            actual_hash = bcrypt.hashpw(pw.encode('utf8'), expected_hash)
-            return expected_hash == actual_hash
+            return bcrypt.checkpw(pw.encode('utf8'), expected_hash)
         return False
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/models/user.py b/docs/tutorials/wiki2/src/authorization/tutorial/models/user.py
index 6fb32a1b2..9228b48f7 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/models/user.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/models/user.py
@@ -19,11 +19,10 @@ class User(Base):
 
     def set_password(self, pw):
         pwhash = bcrypt.hashpw(pw.encode('utf8'), bcrypt.gensalt())
-        self.password_hash = pwhash
+        self.password_hash = pwhash.decode('utf8')
 
     def check_password(self, pw):
         if self.password_hash is not None:
             expected_hash = self.password_hash.encode('utf8')
-            actual_hash = bcrypt.hashpw(pw.encode('utf8'), expected_hash)
-            return expected_hash == actual_hash
+            return bcrypt.checkpw(pw.encode('utf8'), expected_hash)
         return False
diff --git a/docs/tutorials/wiki2/src/models/tutorial/models/user.py b/docs/tutorials/wiki2/src/models/tutorial/models/user.py
index 6fb32a1b2..9228b48f7 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/models/user.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/models/user.py
@@ -19,11 +19,10 @@ class User(Base):
 
     def set_password(self, pw):
         pwhash = bcrypt.hashpw(pw.encode('utf8'), bcrypt.gensalt())
-        self.password_hash = pwhash
+        self.password_hash = pwhash.decode('utf8')
 
     def check_password(self, pw):
         if self.password_hash is not None:
             expected_hash = self.password_hash.encode('utf8')
-            actual_hash = bcrypt.hashpw(pw.encode('utf8'), expected_hash)
-            return expected_hash == actual_hash
+            return bcrypt.checkpw(pw.encode('utf8'), expected_hash)
         return False
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/models/user.py b/docs/tutorials/wiki2/src/tests/tutorial/models/user.py
index 6fb32a1b2..9228b48f7 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/models/user.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/models/user.py
@@ -19,11 +19,10 @@ class User(Base):
 
     def set_password(self, pw):
         pwhash = bcrypt.hashpw(pw.encode('utf8'), bcrypt.gensalt())
-        self.password_hash = pwhash
+        self.password_hash = pwhash.decode('utf8')
 
     def check_password(self, pw):
         if self.password_hash is not None:
             expected_hash = self.password_hash.encode('utf8')
-            actual_hash = bcrypt.hashpw(pw.encode('utf8'), expected_hash)
-            return expected_hash == actual_hash
+            return bcrypt.checkpw(pw.encode('utf8'), expected_hash)
         return False
diff --git a/docs/tutorials/wiki2/src/views/tutorial/models/user.py b/docs/tutorials/wiki2/src/views/tutorial/models/user.py
index 6fb32a1b2..9228b48f7 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/models/user.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/models/user.py
@@ -19,11 +19,10 @@ class User(Base):
 
     def set_password(self, pw):
         pwhash = bcrypt.hashpw(pw.encode('utf8'), bcrypt.gensalt())
-        self.password_hash = pwhash
+        self.password_hash = pwhash.decode('utf8')
 
     def check_password(self, pw):
         if self.password_hash is not None:
             expected_hash = self.password_hash.encode('utf8')
-            actual_hash = bcrypt.hashpw(pw.encode('utf8'), expected_hash)
-            return expected_hash == actual_hash
+            return bcrypt.checkpw(pw.encode('utf8'), expected_hash)
         return False