commit 22e2eaee0b48318c3a3e5eda7ce9174ac8cfce6a
author Alex Gaynor <alex.gaynor@gmail.com> Tue Oct 29 11:42:14 2013 -0700
committer Alex Gaynor <alex.gaynor@gmail.com> Tue Oct 29 11:42:14 2013 -0700
tree 73bc4826dd999a710366a5d0e9f995713297903e
parent 23aeea2527e5b2f26596488ee1635a9f48713e42

Removed helper

cryptography/hazmat/primitives/padding.py

diff --git a/cryptography/hazmat/primitives/padding.py b/cryptography/hazmat/primitives/padding.py
index d5fb032..27a1fac 100644
--- a/cryptography/hazmat/primitives/padding.py
+++ b/cryptography/hazmat/primitives/padding.py
@@ -33,14 +33,6 @@
     def unpadder(self):
         return _PKCS7UnpaddingContext(self.block_size)
 
-    def pad(self, data):
-        padder = self.padder()
-        return padder.update(data) + padder.finalize()
-
-    def unpad(self, data):
-        unpadder = self.unpadder()
-        return unpadder.update(data) + unpadder.finalize()
-
 
 @interfaces.register(interfaces.PaddingContext)
 class _PKCS7PaddingContext(object):

docs/hazmat/primitives/padding.rst

diff --git a/docs/hazmat/primitives/padding.rst b/docs/hazmat/primitives/padding.rst
index 7cbadeb..1ad2bb8 100644
--- a/docs/hazmat/primitives/padding.rst
+++ b/docs/hazmat/primitives/padding.rst
@@ -28,7 +28,10 @@
 
         >>> from cryptography.hazmat.primitives import padding
         >>> padder = padding.PKCS7(128)
-        >>> padder.pad(b"1111111111")
+        >>> padder = padder.padder()
+        >>> padder.update(b"1111111111")
+        ''
+        >>> padder.finalize()
         '1111111111\x06\x06\x06\x06\x06\x06'
 
     :param block_size: The size of the block in bits that the data is being

tests/hazmat/primitives/test_padding.py

diff --git a/tests/hazmat/primitives/test_padding.py b/tests/hazmat/primitives/test_padding.py
index a41edac..c47b6c5 100644
--- a/tests/hazmat/primitives/test_padding.py
+++ b/tests/hazmat/primitives/test_padding.py
@@ -31,8 +31,10 @@
     def test_invalid_padding(self, size, padded):
         padder = padding.PKCS7(size)
 
+        unpadder = padder.unpadder()
         with pytest.raises(ValueError):
-            padder.unpad(padded)
+            unpadder.update(padded)
+            unpadder.finalize()
 
     @pytest.mark.parametrize(("size", "unpadded", "padded"), [
         (
@@ -48,7 +50,10 @@
     ])
     def test_pad(self, size, unpadded, padded):
         padder = padding.PKCS7(size)
-        assert padder.pad(unpadded) == padded
+        padder = padder.padder()
+        result = padder.update(unpadded)
+        result += padder.finalize()
+        assert result == padded
 
     @pytest.mark.parametrize(("size", "unpadded", "padded"), [
         (
@@ -64,7 +69,10 @@
     ])
     def test_unpad(self, size, unpadded, padded):
         padder = padding.PKCS7(size)
-        assert padder.unpad(padded) == unpadded
+        unpadder = padder.unpadder()
+        result = unpadder.update(padded)
+        result += unpadder.finalize()
+        assert result == unpadded
 
     def test_use_after_finalize(self):
         p = padding.PKCS7(128)