Removed deprecated hash() interface

Author: oohlaf

CHANGELOG.md

@@ -13,6 +13,9 @@
 - Started using [semantic versioning][semver] together with
   [keep a changelog][keepachangelog].
 
+### Deprecated
+- Removed the old deprecated `hash()` interface.
+
 ## [0.3] - 2013-01-23
 
 ### Added

README.md

@@ -31,19 +31,7 @@ You need to specify the encoding of these strings before hashing.
 
 Strings that are marked as binary do not need encoding.
 
-Deprecated usage
-----------------
-
-For backward compatibility the old interface remains available. From Python 3
-onwards, the old interface is dropped.
-
-    import whirlpool
-
-    hashed_string = whirlpool.hash("My String")
-
-
 Testing
 -------
 
 This module is tested using Python 2.7 and Python 3.3.
-

main.c

@@ -377,38 +377,10 @@ Return a new whirlpool object. If arg is present, the method call update(arg)\n\
 is made.");
 
 
-#if PY_MAJOR_VERSION < 3
-/* Function is deprecated and only available in Python 2.7 */
-static PyObject *
-whirlpool_hash(PyObject *self, PyObject *args) {
-    struct NESSIEstruct w;
-    unsigned char digest[DIGESTBYTES];
-    Py_ssize_t data_size;
-    unsigned char *data;
-
-    if(!PyArg_ParseTuple(args, "s#", &data, &data_size))
-        return NULL;
-    
-    NESSIEinit(&w);
-    NESSIEadd(data, data_size*8, &w);
-    NESSIEfinalize(&w, digest);
-
-    return Py_BuildValue("s#", digest, DIGESTBYTES);
-}
-
-PyDoc_STRVAR(hash_doc,
-"Returns a hash of argument using the whirlpool algorithm.\n\
-This function is deprecated. Please use new() and hexdigest().");
-#endif
-
-
 /* List of functions exported by this module */
 
 static struct PyMethodDef whirlpool_functions[] = {
     {"new",  (PyCFunction)whirlpool_new,  METH_VARARGS, new_doc},
-#if PY_MAJOR_VERSION < 3
-    {"hash", (PyCFunction)whirlpool_hash, METH_VARARGS, hash_doc},
-#endif
     {NULL, NULL} /* sentinel */
 };
 

tests.py

@@ -34,15 +34,6 @@ def digest2hex(data):
 
 class TestWhirlpool(unittest.TestCase):
 
-    @unittest.skipIf(sys.hexversion >= 0x03000000, "function deprecated")
-    def test_hash_empty(self):
-        self.assertEqual(digest2hex(whirlpool.hash(data['empty'])), results['empty'])
-
-    @unittest.skipIf(sys.hexversion >= 0x03000000, "function deprecated")
-    def test_hash_fox(self):
-        self.assertEqual(digest2hex(whirlpool.hash(data['tqbfjotld'])), results['tqbfjotld'])
-        self.assertEqual(digest2hex(whirlpool.hash(data['tqbfjotle'])), results['tqbfjotle'])
-
     def test_new_empty(self):
         wp = whirlpool.new()
         self.assertEqual(digest2hex(wp.digest()), results['empty'])