From 7d5c3dcd969161322deed6c43f8a6a3cb92c3369 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 11 Nov 2014 11:53:55 -0500
Subject: upgrade to 14.4.1

---
 zmq/backend/cython/error.pyx | 56 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 zmq/backend/cython/error.pyx

(limited to 'zmq/backend/cython/error.pyx')

diff --git a/zmq/backend/cython/error.pyx b/zmq/backend/cython/error.pyx
new file mode 100644
index 0000000..85e785f
--- /dev/null
+++ b/zmq/backend/cython/error.pyx
@@ -0,0 +1,56 @@
+"""0MQ Error classes and functions."""
+
+#
+#    Copyright (c) 2010-2011 Brian E. Granger & Min Ragan-Kelley
+#
+#    This file is part of pyzmq.
+#
+#    pyzmq is free software; you can redistribute it and/or modify it under
+#    the terms of the Lesser GNU General Public License as published by
+#    the Free Software Foundation; either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    pyzmq is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    Lesser GNU General Public License for more details.
+#
+#    You should have received a copy of the Lesser GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+
+# allow const char*
+cdef extern from *:
+    ctypedef char* const_char_ptr "const char*"
+
+from libzmq cimport zmq_strerror, zmq_errno as zmq_errno_c
+
+from zmq.utils.strtypes import bytes
+
+def strerror(int errno):
+    """strerror(errno)
+
+    Return the error string given the error number.
+    """
+    cdef const_char_ptr str_e
+    # char * will be a bytes object:
+    str_e = zmq_strerror(errno)
+    if str is bytes:
+        # Python 2: str is bytes, so we already have the right type
+        return str_e
+    else:
+        # Python 3: decode bytes to unicode str
+        return str_e.decode()
+
+def zmq_errno():
+    """zmq_errno()
+    
+    Return the integer errno of the most recent zmq error.
+    """
+    return zmq_errno_c()
+
+__all__ = ['strerror', 'zmq_errno']
-- 
cgit v1.2.3