From 1225270be8af862a82e45342f086419dbedce0fb Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 2 Jan 2014 11:10:35 -0800 Subject: Correct spelling, fix phrasing, line wrap. --- docs/hazmat/bindings/index.rst | 2 +- docs/hazmat/primitives/hmac.rst | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/hazmat/bindings/index.rst b/docs/hazmat/bindings/index.rst index 809eddfc..e2a17591 100644 --- a/docs/hazmat/bindings/index.rst +++ b/docs/hazmat/bindings/index.rst @@ -6,7 +6,7 @@ Bindings .. currentmodule:: cryptography.hazmat.bindings ``cryptography`` aims to provide low-level CFFI based bindings to multiple -native C libraries. These provide no automatic initialisation of the library +native C libraries. These provide no automatic initialization of the library and may not provide complete wrappers for its API. Using these functions directly is likely to require you to be careful in diff --git a/docs/hazmat/primitives/hmac.rst b/docs/hazmat/primitives/hmac.rst index b8f94fd2..dc5c54f8 100644 --- a/docs/hazmat/primitives/hmac.rst +++ b/docs/hazmat/primitives/hmac.rst @@ -74,8 +74,11 @@ message. .. method:: verify(signature) - Finalize the current context and securely compare digest to ``signature``. + Finalize the current context and securely compare digest to + ``signature``. - :param bytes signature: The bytes of the HMAC signature recieved. + :param bytes signature: The bytes to compare the current digest + against. :raises cryptography.exceptions.AlreadyFinalized: See :meth:`finalize` - :raises cryptography.exceptions.InvalidSignature: If signature does not match digest + :raises cryptography.exceptions.InvalidSignature: If signature does not + match digest -- cgit v1.2.3 From f51f2c1c5f24f627cfe57c2ea6d821c87f7a6c20 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 3 Jan 2014 07:33:01 -0800 Subject: Include a long description in our setup.py --- setup.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/setup.py b/setup.py index 1856cadb..e2df1c46 100644 --- a/setup.py +++ b/setup.py @@ -10,6 +10,8 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. +import os + from setuptools import setup, find_packages @@ -30,11 +32,16 @@ setup_requires = [ CFFI_DEPENDENCY, ] +with open(os.path.join(os.path.dirname(__file__), "README.rst")) as f: + long_description = f.read() + + setup( name=about["__title__"], version=about["__version__"], description=about["__summary__"], + long_description=long_description, license=about["__license__"], url=about["__uri__"], -- cgit v1.2.3 From 7630d6c50b3112eae69de606760cfb3e3b070c26 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 3 Jan 2014 07:34:43 -0800 Subject: Also use an absolute path for the about file --- setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index e2df1c46..3202f843 100644 --- a/setup.py +++ b/setup.py @@ -15,9 +15,11 @@ import os from setuptools import setup, find_packages +base_dir = os.path.dirname(__file__) + about = {} -with open("cryptography/__about__.py") as fp: - exec(fp.read(), about) +with open(os.path.join(base_dir, "cryptography", "__about__.py")) as f: + exec(f.read(), about) CFFI_DEPENDENCY = "cffi>=0.6" @@ -32,7 +34,7 @@ setup_requires = [ CFFI_DEPENDENCY, ] -with open(os.path.join(os.path.dirname(__file__), "README.rst")) as f: +with open(os.path.join(base_dir, "README.rst")) as f: long_description = f.read() -- cgit v1.2.3 From 0421ff0201dae6380bddae53c247801789a235a9 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 3 Jan 2014 10:13:20 -0600 Subject: add to author list --- cryptography/__about__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 46212bff..54a9dbe6 100644 --- a/cryptography/__about__.py +++ b/cryptography/__about__.py @@ -26,7 +26,7 @@ __version__ = "0.1.dev1" __author__ = ("Alex Gaynor, Hynek Schlawack, Donald Stufft, " "Laurens Van Houtven, Jean-Paul Calderone, Christian Heimes, " - "and individual contributors.") + "Paul Kehrer, and individual contributors.") __email__ = "cryptography-dev@python.org" __license__ = "Apache License, Version 2.0" -- cgit v1.2.3 From f03334e25c3c31094015d1421feef7bcec9a9c1f Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 2 Jan 2014 23:16:14 -0600 Subject: backend support check now lists which backend caused the skip --- tests/test_utils.py | 2 +- tests/utils.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test_utils.py b/tests/test_utils.py index c640367e..e3e53d63 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -50,7 +50,7 @@ def test_check_backend_support_skip(): funcargs={"backend": True}) with pytest.raises(pytest.skip.Exception) as exc_info: check_backend_support(item) - assert exc_info.value.args[0] == "Nope" + assert exc_info.value.args[0] == "Nope (True)" def test_check_backend_support_no_skip(): diff --git a/tests/utils.py b/tests/utils.py index beb2ca5d..693a0c8f 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -28,7 +28,9 @@ def check_backend_support(item): supported = item.keywords.get("supported") if supported and "backend" in item.funcargs: if not supported.kwargs["only_if"](item.funcargs["backend"]): - pytest.skip(supported.kwargs["skip_message"]) + pytest.skip("{0} ({1})".format( + supported.kwargs["skip_message"], item.funcargs["backend"] + )) elif supported: raise ValueError("This mark is only available on methods that take a " "backend") -- cgit v1.2.3