diff options
author | Eugene <gish.ee18@gmail.com> | 2020-08-17 14:44:23 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-17 07:44:23 -0400 |
commit | 0b88cb2273b564a4193ac11813347484fc1cec7c (patch) | |
tree | 3cb0b567aa4a792acd17ab25d1bd9434a9e8655d /tests/test_bcrypt.py | |
parent | a571ad475d90e64e63286245dca19f4f8cfdcbd6 (diff) | |
download | py-bcrypt-git-0b88cb2273b564a4193ac11813347484fc1cec7c.tar.gz |
Drop six dependency (#225)
* Drop six dependency
* Resolve formatting error
Diffstat (limited to 'tests/test_bcrypt.py')
-rw-r--r-- | tests/test_bcrypt.py | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/tests/test_bcrypt.py b/tests/test_bcrypt.py index 37baa54..6b61576 100644 --- a/tests/test_bcrypt.py +++ b/tests/test_bcrypt.py @@ -2,8 +2,6 @@ import os import pytest -import six - import bcrypt @@ -264,30 +262,22 @@ def test_checkpw_bad_salt(): def test_checkpw_str_password(): with pytest.raises(TypeError): - bcrypt.checkpw( - six.text_type("password"), b"$2b$04$cVWp4XaNU8a4v1uMRum2SO", - ) + bcrypt.checkpw("password", b"$2b$04$cVWp4XaNU8a4v1uMRum2SO") def test_checkpw_str_salt(): with pytest.raises(TypeError): - bcrypt.checkpw( - b"password", six.text_type("$2b$04$cVWp4XaNU8a4v1uMRum2SO"), - ) + bcrypt.checkpw(b"password", "$2b$04$cVWp4XaNU8a4v1uMRum2SO") def test_hashpw_str_password(): with pytest.raises(TypeError): - bcrypt.hashpw( - six.text_type("password"), b"$2b$04$cVWp4XaNU8a4v1uMRum2SO", - ) + bcrypt.hashpw("password", b"$2b$04$cVWp4XaNU8a4v1uMRum2SO") def test_hashpw_str_salt(): with pytest.raises(TypeError): - bcrypt.hashpw( - b"password", six.text_type("$2b$04$cVWp4XaNU8a4v1uMRum2SO"), - ) + bcrypt.hashpw(b"password", "$2b$04$cVWp4XaNU8a4v1uMRum2SO") def test_checkpw_nul_byte(): @@ -440,14 +430,12 @@ def test_kdf(rounds, password, salt, expected): def test_kdf_str_password(): with pytest.raises(TypeError): - bcrypt.kdf( - six.text_type("password"), b"$2b$04$cVWp4XaNU8a4v1uMRum2SO", 10, 10 - ) + bcrypt.kdf("password", b"$2b$04$cVWp4XaNU8a4v1uMRum2SO", 10, 10) def test_kdf_str_salt(): with pytest.raises(TypeError): - bcrypt.kdf(b"password", six.text_type("salt"), 10, 10) + bcrypt.kdf(b"password", "salt", 10, 10) def test_kdf_no_warn_rounds(): |