more tweaks, cleaned up socketutil module some more. Python 3.5 is now required!

Author: irmen

.travis.yml

@@ -1,7 +1,6 @@
 # travis CI config
 language: python
 python:
-  - 3.4
   - 3.5
   - 3.6
   - 3.7-dev

Pyro5/compatibility/Pyro4.py

@@ -25,6 +25,8 @@
 # from Pyro4.futures import Future
 
 import sys
+import ipaddress
+
 from .. import api
 from .. import errors
 from .. import serializers
@@ -141,25 +143,25 @@ def excepthook(self, *args, **kwargs):
 class SocketUtilModule:
     @staticmethod
     def getIpVersion(hostnameOrAddress):
-        return socketutil_pyro5.get_ip_version(hostnameOrAddress)
+        return ipaddress.ip_address(hostnameOrAddress).version
 
     @staticmethod
     def getIpAddress(hostname, workaround127=False, ipVersion=None):
-        return socketutil_pyro5.get_ip_address(hostname, workaround127, ipVersion)
+        return str(socketutil_pyro5.get_ip_address(hostname, workaround127, ipVersion))
 
     @staticmethod
     def getInterfaceAddress(ip_address):
-        return socketutil_pyro5.get_interface_address(ip_address)
+        return str(socketutil_pyro5.get_interface(ip_address).ip)
 
     @staticmethod
     def createSocket(bind=None, connect=None, reuseaddr=False, keepalive=True,
-                     timeout=socketutil_pyro5._GLOBAL_DEFAULT_TIMEOUT, noinherit=False,
+                     timeout=-1, noinherit=False,
                      ipv6=False, nodelay=True, sslContext=None):
         return socketutil_pyro5.create_socket(bind, connect, reuseaddr, keepalive,
                                               timeout, noinherit, ipv6, nodelay, sslContext)
 
     @staticmethod
-    def createBroadcastSocket(bind=None, reuseaddr=False, timeout=socketutil_pyro5._GLOBAL_DEFAULT_TIMEOUT, ipv6=False):
+    def createBroadcastSocket(bind=None, reuseaddr=False, timeout=-1, ipv6=False):
         return socketutil_pyro5.create_bc_socket(bind, reuseaddr, timeout, ipv6)
 
     @staticmethod

Pyro5/nameserver.py

@@ -14,7 +14,7 @@
 try:
     import sqlite3
 except ImportError:
-    sqlite3 = None
+    pass
 from . import config, core, socketutil, server, errors
 from .errors import NamingError, PyroError, ProtocolError
 
@@ -631,8 +631,8 @@ def processRequest(self):
                 if responsedata.host == "0.0.0.0":
                     # replace INADDR_ANY address by the interface IP address that connects to the requesting client
                     try:
-                        interface_ip = socketutil.get_interface_address(addr[0])
-                        responsedata.host = interface_ip
+                        interface_ip = socketutil.get_interface(addr[0]).ip
+                        responsedata.host = str(interface_ip)
                     except socket.error:
                         pass
                 log.debug("responding to broadcast request from %s: interface %s", addr[0], responsedata.host)