Fix ctype int for _INT_PACKER and cleanup travisci config

.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: ci
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        sudo apt-get install -y libnanomsg-dev nanomsg-utils
+        pip install tox
+    - name: Test with tox
+      run: |
+        tox -e py
+        # pytest tests --flake8 nanomsg -v --cov nanomsg nanomsg_wrappers _nanomsg_ctypes --cov-report term-missing

README.md

@@ -1,6 +1,10 @@
 nanomsg-python
 ==============
 
+![GitHub CI Workflow Status](https://img.shields.io/github/workflow/status/freepn/nanomsg-python/ci)
+
+This fork of nanomsg-python is currently tested on Python 2.7 and Python 3.6+ on Linux, Darwin, and Windows (the latter two somewhat theoretical).
+
 Python library for [nanomsg](http://nanomsg.org/) which does not compromise on
 usability or performance.
 

_nanomsg_ctypes/__init__.py

@@ -1,8 +1,6 @@
-from __future__ import division, absolute_import, print_function,\
- unicode_literals
+from __future__ import division, absolute_import, print_function, unicode_literals
 
 import ctypes
-import platform
 import sys
 
 if sys.platform in ('win32', 'cygwin'):
@@ -19,7 +17,7 @@
 def _c_func_wrapper_factory(cdecl_text):
     def move_pointer_and_strip(type_def, name):
         if '*' in name:
-            type_def += ' ' + name[:name.rindex('*')+1]
+            type_def += ' ' + name[:name.rindex('*') + 1]
             name = name.rsplit('*', 1)[1]
         return type_def.strip(), name.strip()
 
@@ -31,35 +29,34 @@ def type_lookup(type_def):
             'int': ctypes.c_int,
             'int *': ctypes.POINTER(ctypes.c_int),
             'void *': ctypes.c_void_p,
-            'size_t':  ctypes.c_size_t,
-            'size_t *':  ctypes.POINTER(ctypes.c_size_t),
+            'size_t': ctypes.c_size_t,
+            'size_t *': ctypes.POINTER(ctypes.c_size_t),
             'struct nn_msghdr *': ctypes.c_void_p,
             'struct nn_pollfd *': ctypes.c_void_p,
         }
-        type_def_without_const = type_def.replace('const ','')
+        type_def_without_const = type_def.replace('const ', '')
         if type_def_without_const in types:
             return types[type_def_without_const]
-        elif (type_def_without_const.endswith('*') and
-                type_def_without_const[:-1] in types):
+        elif (type_def_without_const.endswith('*') and type_def_without_const[:-1] in types):
             return ctypes.POINTER(types[type_def_without_const[:-1]])
         else:
             raise KeyError(type_def)
 
-        return types[type_def.replace('const ','')]
+        return types[type_def.replace('const ', '')]
 
-    a, b = [i.strip() for i in cdecl_text.split('(',1)]
-    params, _ = b.rsplit(')',1)
+    a, b = [i.strip() for i in cdecl_text.split('(', 1)]
+    params, dummy = b.rsplit(')', 1)
     rtn_type, name = move_pointer_and_strip(*a.rsplit(' ', 1))
     param_spec = []
     for param in params.split(','):
         if param != 'void':
             param_spec.append(move_pointer_and_strip(*param.rsplit(' ', 1)))
-    func = _functype(type_lookup(rtn_type),
-                     *[type_lookup(type_def) for type_def, _ in param_spec])(
-                        (name, _lib),
-                        tuple((2 if '**' in type_def else 1, name)
-                              for type_def, name in param_spec)
-                    )
+    func = (
+        _functype(type_lookup(rtn_type),
+                  *[type_lookup(type_def) for type_def, _ in param_spec])
+        ((name, _lib), tuple((2 if '**' in type_def else 1, name)
+                             for type_def, name in param_spec)))
+
     func.__name__ = name
     return func
 
@@ -136,7 +133,7 @@ def create_writable_buffer(size):
 
     This is the ctypes implementation.
     """
-    return (ctypes.c_ubyte*size)()
+    return (ctypes.c_ubyte * size)()
 
 
 def nn_setsockopt(socket, level, option, value):
@@ -188,7 +185,7 @@ def nn_send(socket, msg, flags):
 
 def _create_message(address, length):
     class Message(ctypes.Union):
-        _fields_ = [('_buf', ctypes.c_ubyte*length)]
+        _fields_ = [('_buf', ctypes.c_ubyte * length)]
         _len = length
         _address = address
 
@@ -237,7 +234,7 @@ def nn_poll(fds, timeout=-1):
         s.revents = 0
         polls.append(s)
 
-    poll_array = (PollFds*len(fds))(*polls)
+    poll_array = (PollFds * len(fds))(*polls)
     res = _nn_poll(poll_array, len(fds), int(timeout))
     if res <= 0:
         return res, {}
@@ -276,7 +273,7 @@ def nn_recv(socket, *args):
     else:
         _nclib = ctypes.cdll.LoadLibrary('libnanoconfig.so')
 except OSError:
-    pass # No nanoconfig, sorry
+    pass  # No nanoconfig, sorry
 else:
     # int nc_configure (int s, const char *addr)
     nc_configure = _functype(ctypes.c_int, ctypes.c_int, ctypes.c_char_p)(

appveyor_yml.disabled

@@ -0,0 +1,50 @@
+# What Python version is installed where:
+# http://www.appveyor.com/docs/installed-software#python
+
+image:
+  - Visual Studio 2019
+
+environment:
+  global:
+    PYTHONIOENCODING: utf-8
+  matrix:
+    - PYTHON: "C:\\Python36-x64"
+      TOX_ENV: "py36"
+    - PYTHON: "C:\\Python37-x64"
+      TOX_ENV: "py37"
+    - PYTHON: "C:\\Python38-x64"
+      TOX_ENV: "py38"
+    - PYTHON: "C:\\Python39-x64"
+      TOX_ENV: "py39"
+
+## Before repo cloning
+init:
+  ## without this, temporary directory could be created in current dir
+  ## which will make some tests fail.
+  - mkdir C:\TMP
+  - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
+  - set TOX_TESTENV_PASSENV=DISTUTILS_USE_SDK MSSdk INCLUDE LIB
+  - python -V
+
+## After repo cloning
+install:
+  - cmd: cd c:\tools\vcpkg
+  - cmd: vcpkg integrate install
+  - cmd: vcpkg install nanomsg:x64-windows
+  - cmd: cd "%APPVEYOR_BUILD_FOLDER%"
+
+build: false
+
+## Before tests
+before_test:
+  - python -m pip install --upgrade pip wheel
+  - pip install tox virtualenv codecov
+
+## Custom test script
+test_script:
+
+  ## real tests
+  - "%PYTHON%/Scripts/tox -e %TOX_ENV%"
+
+  ## installable
+  - pip install .

nanomsg/__init__.py

@@ -1,8 +1,6 @@
 from __future__ import division, absolute_import, print_function, unicode_literals
 
-from .version import __version__
 from struct import Struct as _Struct
-import warnings
 
 from . import wrapper
 
@@ -13,7 +11,7 @@
 
 nanoconfig_started = False
 
-#Import constants into module with NN_ prefix stripped
+# Import constants into module with NN_ prefix stripped
 for name, value in wrapper.nn_symbols():
     if name.startswith('NN_'):
         name = name[3:]
@@ -112,7 +110,7 @@ def poll(in_sockets, out_sockets, timeout=-1):
 
     # convert to milliseconds or -1
     if timeout >= 0:
-        timeout_ms = int(timeout*1000)
+        timeout_ms = int(timeout * 1000)
     else:
         timeout_ms = -1
     res, sockets = wrapper.nn_poll(sockets, timeout_ms)
@@ -159,7 +157,7 @@ class Socket(object):
 
     """
 
-    _INT_PACKER = _Struct(str('l'))
+    _INT_PACKER = _Struct(str('i'))
 
     class _Endpoint(object):
         def __init__(self, socket, endpoint_id, address):
@@ -174,7 +172,7 @@ def address(self):
         def shutdown(self):
             self._fdocket._endpoints.remove(self)
             _nn_check_positive_rtn(wrapper.nn_shutdown(self._fdocket._fd,
-                                               self._endpoint_id))
+                                   self._endpoint_id))
 
         def __repr__(self):
             return '<%s socket %r, id %r, address %r>' % (
@@ -258,8 +256,8 @@ def _set_reconnect_interval_max(self, value):
 
     send_fd = property(_get_send_fd, doc='Send file descripter')
     recv_fd = property(_get_recv_fd, doc='Receive file descripter')
-    linger  = property(_get_linger, _set_linger, doc='Socket linger in '
-                       'milliseconds (0.001 seconds)')
+    linger = property(_get_linger, _set_linger, doc='Socket linger in '
+                      'milliseconds (0.001 seconds)')
     recv_buffer_size = property(_get_recv_buffer_size, _set_recv_buffer_size,
                                 doc='Receive buffer size in bytes')
     send_buffer_size = property(_get_send_buffer_size, _set_send_buffer_size,
@@ -298,8 +296,8 @@ def endpoints(self):
 
     @property
     def uses_nanoconfig(self):
-        return (self._endpoints and
-            isinstance(self._endpoints[0], Socket.NanoconfigEndpoint))
+        return (self._endpoints and isinstance(self._endpoints[0],
+                Socket.NanoconfigEndpoint))
 
     def bind(self, address):
         """Add a local endpoint to the socket"""
@@ -382,10 +380,10 @@ def get_int_option(self, level, option):
         _nn_check_positive_rtn(rtn)
         if length != size:
             raise NanoMsgError(('Returned option size (%r) should be the same'
-                                ' as size of int (%r)') % (rtn, size))
+                                ' as size of int (%r)') % (length, size))
         return Socket._INT_PACKER.unpack_from(buffer(buf))[0]
 
-    def get_string_option(self, level, option, max_len=16*1024):
+    def get_string_option(self, level, option, max_len=16 * 1024):
         buf = create_writable_buffer(max_len)
         rtn, length = wrapper.nn_getsockopt(self._fd, level, option, buf)
         _nn_check_positive_rtn(rtn)

nanomsg/version.py

@@ -1,2 +1 @@
-
-__version__ = '1.0'
+__version__ = '1.0.2-4'