From f77c7798013683098b2d882976a1e4043f26c70a Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@k1024.org>
Date: Sun, 3 Mar 2019 13:56:58 +0100
Subject: [PATCH] Makefile: re-enable pypy and add pypy3

Everything works again now, so let's enable them.
---
 Makefile | 10 ++++++----
 acl.c    | 17 +++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index d613416..e4e5129 100644
--- a/Makefile
+++ b/Makefile
@@ -31,10 +31,12 @@ test:
 	    fi; \
 	  done; \
 	done; \
-#	if type pypy >/dev/null; then \
-#	  echo Testing with pypy; \
-#	  pypy ./setup.py test -q; \
-#	fi
+	for pp in pypy pypy3; do \
+	  if type $$pp >/dev/null; then \
+	    echo Testing with $$pp; \
+	    $$pp ./setup.py test -q; \
+	  fi; \
+	done
 
 coverage:
 	$(MAKE) clean
diff --git a/acl.c b/acl.c
index 2c62b9a..9f2d603 100644
--- a/acl.c
+++ b/acl.c
@@ -150,7 +150,7 @@ static int ACL_init(PyObject* obj, PyObject* args, PyObject *keywds) {
 #ifdef HAVE_LINUX
     static char *kwlist[] = { "file", "fd", "text", "acl", "filedef",
                               "mode", NULL };
-    char *format = "|etisO!sH";
+    char *format = "|etisO!si";
     int mode = -1;
 #else
     static char *kwlist[] = { "file", "fd", "text", "acl", "filedef", NULL };
@@ -1260,17 +1260,18 @@ static char __ACL_Type_doc__[] =
     ".. note:: only one keyword parameter should be provided\n"
     "\n"
     ":param string file: creates an ACL representing\n"
-    "    the access ACL of the specified file\n"
+    "    the access ACL of the specified file.\n"
     ":param string filedef: creates an ACL representing\n"
-    "    the default ACL of the given directory\n"
+    "    the default ACL of the given directory.\n"
     ":param int fd: creates an ACL representing\n"
-    "    the access ACL of the given file descriptor\n"
+    "    the access ACL of the given file descriptor.\n"
     ":param string text: creates an ACL from a \n"
-    "    textual description\n"
-    ":param ACL acl: creates a copy of an existing ACL instance\n"
+    "    textual description.\n"
+    ":param ACL acl: creates a copy of an existing ACL instance.\n"
     ":param int mode: creates an ACL from a numeric mode\n"
-    "    (e.g. mode=0644) (this is valid only when the C library\n"
-    "    provides the acl_from_mode call)\n"
+    "    (e.g. mode=0644); this is valid only when the C library\n"
+    "    provides the acl_from_mode call, and\n"
+    "    note that no validation is done on the given value.\n"
     "\n"
     "If no parameters are passed, an empty ACL will be created; this\n"
     "makes sense only when your OS supports ACL modification\n"
-- 
2.39.2