Pyro5 5.15__tar.gz → 5.16__tar.gz

{Pyro5-5.15 → pyro5-5.16}/.github/workflows/main-ci.yml

@@ -18,13 +18,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
         
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

{Pyro5-5.15 → pyro5-5.16}/Makefile

@@ -2,21 +2,18 @@
 PYTHON=python3
 
 all:
-	@echo "targets: dist, docs, upload, install, clean, test"
+	@echo "targets: dist, docs, upload, clean, test"
 
 docs:
 	sphinx-build docs/source build/docs
 
 dist:
-	$(PYTHON) setup.py sdist bdist_wheel
+	$(PYTHON) -m build --sdist --wheel
 
 upload: dist
 	@echo "Uploading to Pypi using twine...."
 	twine upload dist/*
 
-install:
-	$(PYTHON) setup.py install
-
 test:
 	PYTHONPATH=. python3 -m pytest tests
 

{Pyro5-5.15 → pyro5-5.16}/PKG-INFO

@@ -1,16 +1,14 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Pyro5
-Version: 5.15
+Version: 5.16
 Summary: Remote object communication library, fifth major version
 Home-page: https://github.com/irmen/Pyro5
 Author: Irmen de Jong
 Author-email: irmen@razorvine.net
 License: MIT
 Keywords: distributed objects,RPC,remote method call,IPC
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Natural Language :: Dutch
 Classifier: Operating System :: OS Independent
@@ -22,6 +20,8 @@ Classifier: Topic :: System :: Networking
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: serpent>=1.41
+Dynamic: license-file
 
 Pyro5
 =====
@@ -34,6 +34,8 @@ Pyro5
 .. image:: https://anaconda.org/conda-forge/pyro5/badges/version.svg
     :target: https://anaconda.org/conda-forge/pyro5
 
+**Project status: super low maintenance mode. Not really worked on anymore, only reported bugs will be looked at.**
+
 
 Info
 ----
@@ -60,7 +62,7 @@ New code should use Pyro5 if at all possible.
 Features
 --------
 
-- written in 100% Python so extremely portable, supported on Python 3.8 and newer, and Pypy3
+- written in 100% Python so extremely portable, supported on Python 3.9 and newer, and Pypy3
 - works between different system architectures and operating systems.
 - able to communicate between different Python versions transparently.
 - defaults to a safe serializer (`serpent <https://pypi.python.org/pypi/serpent>`_) that supports many Python data types.
@@ -87,5 +89,3 @@ Features
 - large amount of unit tests and high test coverage.
 - reliable and established: built upon more than 20 years of existing Pyro history, with ongoing support and development.
 
-
-

{Pyro5-5.15 → pyro5-5.16}/Pyro5/__init__.py

@@ -4,7 +4,7 @@ Pyro package. Some generic init stuff to set up logging etc.
 Pyro - Python Remote Objects.  Copyright by Irmen de Jong (irmen@razorvine.net).
 """
 
-__version__ = "5.15"
+__version__ = "5.16"
 __author__ = "Irmen de Jong"
 
 

{Pyro5-5.15 → pyro5-5.16}/Pyro5/client.py

@@ -413,7 +413,7 @@ class Proxy(object):
             log.debug("from meta: methods=%s, oneway methods=%s, attributes=%s",
                       sorted(self._pyroMethods), sorted(self._pyroOneway), sorted(self._pyroAttrs))
         if not self._pyroMethods and not self._pyroAttrs:
-            raise errors.PyroError("remote object doesn't expose any methods or attributes. Did you forget setting @expose on them?")
+            raise errors.PyroError("remote object '%s' doesn't expose any methods or attributes. Did you forget setting @expose on them?" % self._pyroUri)
 
     def _pyroReconnect(self, tries=100000000):
         """

{Pyro5-5.15 → pyro5-5.16}/Pyro5/nameserver.py

@@ -645,7 +645,8 @@ class BroadcastServer(object):
 
 
 def start_ns_loop(host=None, port=None, enableBroadcast=True, bchost=None, bcport=None,
-                  unixsocket=None, nathost=None, natport=None, storage=None):
+                  unixsocket=None, nathost=None, natport=None, storage=None, 
+                  loopCondition=lambda: True):
     """utility function that starts a new Name server and enters its requestloop."""
     daemon = NameServerDaemon(host, port, unixsocket, nathost=nathost, natport=natport, storage=storage)
     nsUri = daemon.uriFor(daemon.nameserver)
@@ -681,7 +682,7 @@ def start_ns_loop(host=None, port=None, enableBroadcast=True, bchost=None, bcpor
         print("URI = %s" % nsUri)
     sys.stdout.flush()
     try:
-        daemon.requestLoop()
+        daemon.requestLoop(loopCondition=loopCondition)
     finally:
         daemon.close()
         if bcserver is not None:

{Pyro5-5.15 → pyro5-5.16}/Pyro5/server.py

@@ -168,7 +168,7 @@ class DaemonObject(object):
             metadata = _get_exposed_members(obj)
             if not metadata["methods"] and not metadata["attrs"]:
                 # Something seems wrong: nothing is remotely exposed.
-                warnings.warn("Class %r doesn't expose any methods or attributes. Did you forget setting @expose on them?" % type(obj))
+                warnings.warn("Class %s doesn't expose any methods or attributes. Did you forget setting @expose on them?" % repr(obj))
             return metadata
         else:
             log.debug("unknown object requested: %s", objectId)
@@ -456,6 +456,16 @@ class Daemon(object):
                     if method == "__getattr__":
                         # special case for direct attribute access (only exposed @properties are accessible)
                         data = _get_exposed_property_value(obj, vargs[0])
+                        if not request_flags & protocol.FLAGS_ONEWAY:
+                            isStream, data = self._streamResponse(data, conn)
+                            if isStream:
+                                # throw an exception as well as setting message flags
+                                # this way, it is backwards compatible with older pyro versions.
+                                exc = errors.ProtocolError("result of call is an iterator")
+                                ann = {"STRM": data.encode()} if data else {}
+                                self._sendExceptionResponse(conn, request_seq, serializer.serializer_id, exc, None,
+                                                            annotations=ann, flags=protocol.FLAGS_ITEMSTREAMRESULT)
+                                return
                     elif method == "__setattr__":
                         # special case for direct attribute access (only exposed @properties are accessible)
                         data = _set_exposed_property_value(obj, vargs[0], vargs[1])
@@ -650,7 +660,9 @@ class Daemon(object):
                 obj_or_class._pyroInstancing = ("session", None)
         if not force:
             if hasattr(obj_or_class, "_pyroId") and obj_or_class._pyroId != "":  # check for empty string is needed for Cython
-                raise errors.DaemonError("object or class already has a Pyro id")
+                pyro_id = obj_or_class._pyroId
+                if pyro_id and self.objectsById.get(pyro_id) is obj_or_class:
+                    raise errors.DaemonError("object or class already has a Pyro id")
             if objectId in self.objectsById:
                 raise errors.DaemonError("an object or class is already registered with that id")
         # set some pyro attributes
@@ -664,7 +676,7 @@ class Daemon(object):
             else:
                 ser.register_type_replacement(type(obj_or_class), _pyro_obj_to_auto_proxy)
         # register the object/class in the mapping
-        self.objectsById[obj_or_class._pyroId] = (obj_or_class if not weak else weakref.ref(obj_or_class))
+        self.objectsById[obj_or_class._pyroId] = obj_or_class if not weak else weakref.ref(obj_or_class)
         if weak: weakref.finalize(obj_or_class,self.unregister,objectId)
         return self.uriFor(objectId)
 

{Pyro5-5.15 → pyro5-5.16}/Pyro5.egg-info/PKG-INFO

@@ -1,16 +1,14 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Pyro5
-Version: 5.15
+Version: 5.16
 Summary: Remote object communication library, fifth major version
 Home-page: https://github.com/irmen/Pyro5
 Author: Irmen de Jong
 Author-email: irmen@razorvine.net
 License: MIT
 Keywords: distributed objects,RPC,remote method call,IPC
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Natural Language :: Dutch
 Classifier: Operating System :: OS Independent
@@ -22,6 +20,8 @@ Classifier: Topic :: System :: Networking
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: serpent>=1.41
+Dynamic: license-file
 
 Pyro5
 =====
@@ -34,6 +34,8 @@ Pyro5
 .. image:: https://anaconda.org/conda-forge/pyro5/badges/version.svg
     :target: https://anaconda.org/conda-forge/pyro5
 
+**Project status: super low maintenance mode. Not really worked on anymore, only reported bugs will be looked at.**
+
 
 Info
 ----
@@ -60,7 +62,7 @@ New code should use Pyro5 if at all possible.
 Features
 --------
 
-- written in 100% Python so extremely portable, supported on Python 3.8 and newer, and Pypy3
+- written in 100% Python so extremely portable, supported on Python 3.9 and newer, and Pypy3
 - works between different system architectures and operating systems.
 - able to communicate between different Python versions transparently.
 - defaults to a safe serializer (`serpent <https://pypi.python.org/pypi/serpent>`_) that supports many Python data types.
@@ -87,5 +89,3 @@ Features
 - large amount of unit tests and high test coverage.
 - reliable and established: built upon more than 20 years of existing Pyro history, with ongoing support and development.
 
-
-

{Pyro5-5.15 → pyro5-5.16}/Pyro5.egg-info/entry_points.txt

@@ -4,4 +4,3 @@ pyro5-echoserver = Pyro5.utils.echoserver:main
 pyro5-httpgateway = Pyro5.utils.httpgateway:main
 pyro5-ns = Pyro5.nameserver:main
 pyro5-nsc = Pyro5.nsc:main
-

{Pyro5-5.15 → pyro5-5.16}/Readme.rst

@@ -9,6 +9,8 @@ Pyro5
 .. image:: https://anaconda.org/conda-forge/pyro5/badges/version.svg
     :target: https://anaconda.org/conda-forge/pyro5
 
+**Project status: super low maintenance mode. Not really worked on anymore, only reported bugs will be looked at.**
+
 
 Info
 ----
@@ -35,7 +37,7 @@ New code should use Pyro5 if at all possible.
 Features
 --------
 
-- written in 100% Python so extremely portable, supported on Python 3.8 and newer, and Pypy3
+- written in 100% Python so extremely portable, supported on Python 3.9 and newer, and Pypy3
 - works between different system architectures and operating systems.
 - able to communicate between different Python versions transparently.
 - defaults to a safe serializer (`serpent <https://pypi.python.org/pypi/serpent>`_) that supports many Python data types.

{Pyro5-5.15 → pyro5-5.16}/docs/source/changelog.rst

@@ -2,6 +2,15 @@
 Change Log
 **********
 
+**Pyro 5.16**
+
+- project going into super low maintenance mode, I don't plan on working on it any longer unless nasty bugs are reported.
+- properties can now be a streaming generator too
+- loopCondition is relayed from start_ns_loop() to its daemon
+- removed Python 3.8 and 3.9 from the support list (they are EOL). Now supported on Python 3.10 or newer.
+- docs: clarify @expose on a class not automatically exposing base class(es).
+
+
 **Pyro 5.15**
 
 - removed Python 3.7 from the support list (it is EOL). Now supported on Python 3.8 or newer.

{Pyro5-5.15 → pyro5-5.16}/docs/source/clientcode.rst

@@ -125,9 +125,7 @@ For normal usage, there's not a single line of Pyro specific code once you have
 Accessing remote attributes
 ===========================
 You can access exposed attributes of your remote objects directly via the proxy.
-If you try to access an undefined or unexposed attribute, the proxy will raise an AttributeError stating the problem.
-Note that direct remote attribute access only works if the metadata feature is enabled (``METADATA`` config item, enabled by default).
-::
+If you try to access an undefined or unexposed attribute, the proxy will raise an AttributeError stating the problem::
 
     import Pyro5.api
 
@@ -358,6 +356,8 @@ because the remote generator has been discarded in the meantime.
 Lingering can be disabled completely by setting the value to 0, then all remote generators from a proxy will
 immediately be discarded in the server if the proxy gets disconnected or closed.
 
+Remote properties can also be iterators or generators.
+
 There are several examples that use the remote iterator feature. Have a look at the
 `streaming <https://github.com/irmen/Pyro5/tree/master/examples/streaming>`_ ,
 `stockquotes <https://github.com/irmen/Pyro5/tree/master/examples/stockquotes>`_ or the

{Pyro5-5.15 → pyro5-5.16}/docs/source/intro.rst

@@ -119,7 +119,7 @@ What has been changed since Pyro4
 
 If you're familiar with Pyro4, most of the things are the same in Pyro5. These are the changes though:
 
-- Supported on Python 3.8 or newer.
+- Supported on Python 3.9 or newer.
 - the Pyro5 API is redesigned and this library is not compatible with Pyro4 code (although everything should be familiar):
 
       - Pyro5 is the new package name

{Pyro5-5.15 → pyro5-5.16}/docs/source/servercode.rst

@@ -41,7 +41,10 @@ It lets you mark the following items to be available for remote access:
 - properties (these will be available as remote attributes on the proxy) It's not possible to expose a 'private' property
   (name starting with underscore). You can't expose attributes directly. It is required to provide a @property for them
   and decorate that with ``@expose``, if you want to provide a remotely accessible attribute.
-- classes as a whole (exposing a class has the effect of exposing every nonprivate method and property of the class automatically)
+- classes as a whole (exposing a class has the effect of exposing every nonprivate method and property of the class automatically).
+  *Note*: only the direct members of the class are exposed. If it's part of a class hierarchy, the members of the base class(es) are *not*
+  automatically exposed as well - you'll still have to ``@expose`` those explicitly. This is to avoid making
+  stuff remotely accessible by accident.
 
 Anything that isn't decorated with ``@expose`` is not remotely accessible.
 

{Pyro5-5.15 → pyro5-5.16}/docs/source/tipstricks.rst

@@ -379,6 +379,11 @@ These errors are caused by Numpy datatypes not being recognised by Pyro's serial
    would require a mapping to the appropriate Java or .NET type)
 
 
+.. sidebar:: msgpack + Numpy
+
+    *msgpack-numpy* (https://pypi.org/project/msgpack-numpy/) 'provides encoding and decoding routines that enable the serialization and deserialization of numerical and array data types provided by numpy using the highly efficient msgpack format'.
+    Pyro5 supports msgpack as serializer, so using that together with this library may solve the Numpy data serialization issues.
+
 If you still want to use numpy with Pyro, you'll have to convert the data to standard Python datatypes before using them in Pyro.
 So instead of just ``na = numpy.array(...); return na;``, use this instead:  ``return na.tolist()``.
 Or perhaps even ``return array.array('i', na)`` (serpent understands ``array.array`` just fine).

{Pyro5-5.15 → pyro5-5.16}/examples/streaming/client.py

@@ -17,3 +17,7 @@ with Pyro5.api.Proxy(uri) as p:
     print("\nslow generator:")
     for number in p.slow_generator():
         print(number)
+    print("\nproperty iterator:")
+    print(list(p.prop_iter))
+    print("\nproperty generator:")
+    print(list(p.prop_generator))

{Pyro5-5.15 → pyro5-5.16}/examples/streaming/server.py

@@ -35,6 +35,14 @@ class Streamer(object):
             yield a
             a, b = b, a + b
 
+    @property
+    def prop_iter(self):
+        return iter([1,2,3,4,5,6,7,8,9,10])
+
+    @property
+    def prop_generator(self):
+        return (x for x in range(10))
+
 
 serve({
         Streamer: "example.streamer"

{Pyro5-5.15 → pyro5-5.16}/setup.cfg

@@ -13,7 +13,6 @@ license_file = LICENSE
 classifiers = 
 	Development Status :: 5 - Production/Stable
 	Intended Audience :: Developers
-	License :: OSI Approved :: MIT License
 	Natural Language :: English
 	Natural Language :: Dutch
 	Operating System :: OS Independent

{Pyro5-5.15 → pyro5-5.16}/test-requirements.txt

@@ -1,3 +1,4 @@
+build
 serpent>=1.41
 msgpack>=0.5.2
 pytest

{Pyro5-5.15 → pyro5-5.16}/tests/test_daemon.py

@@ -182,12 +182,24 @@ class TestDaemon:
             assert not(hasattr(o1, "_pyroId"))
             assert not(hasattr(o1, "_pyroDaemon"))
             o1._pyroId = "FOOBAR"
-            with pytest.raises(DaemonError) as x:
-                d.register(o1)
-            assert str(x.value) == "object or class already has a Pyro id"
+            d.register(o1)
             o1._pyroId = ""
             d.register(o1)  # with empty-string _pyroId register should work
 
+    def testRegisterInstanceAndClass(self):
+        with Pyro5.server.Daemon(port=0) as d:
+            o1 = MyObj("object1")
+            o2 = MyObj("object2")
+            d.register(MyObj)
+            d.register(o1)
+            d.register(o2)
+            with pytest.raises(DaemonError) as x:
+                d.register(o2)
+            assert str(x.value) == "object or class already has a Pyro id"
+            with pytest.raises(DaemonError) as x:
+                d.register(MyObj)
+            assert str(x.value) == "object or class already has a Pyro id"
+
     def testRegisterTwiceForced(self):
         with Pyro5.server.Daemon(port=0) as d:
             o1 = MyObj("object1")

{Pyro5-5.15 → pyro5-5.16}/tests/test_server.py

@@ -278,7 +278,7 @@ class TestServerOnce:
             assert p._pyroAttrs == set()
             assert p._pyroMethods == set()
             assert p._pyroOneway == set()
-            # connecting it should obtain metadata (as long as METADATA is true)
+            # connecting it should obtain metadata
             p._pyroBind()
             assert p._pyroAttrs == {'value', 'dictionary'}
             assert p._pyroMethods == {'echo', 'getDict', 'divide', 'nonserializableException', 'ping', 'oneway_delay', 'delayAndId', 'delay', 'testargs',
@@ -299,7 +299,7 @@ class TestServerOnce:
         # read attributes
         with Pyro5.client.Proxy(self.objectUri) as p:
             # unconnected proxy still has empty metadata.
-            # but, as soon as an attribute is used, the metadata is obtained (as long as METADATA is true)
+            # but, as soon as an attribute is used, the metadata is obtained
             a = p.value
             assert a == 12345
             a = p.multiply

{Pyro5-5.15 → pyro5-5.16}/tests/test_socketutil.py

@@ -56,10 +56,15 @@ class TestSocketutil:
 
     def testGetInterface(self):
         addr = socketutil.get_interface("localhost")
-        assert addr.version == 4
-        assert str(addr).startswith("127.")
-        assert str(addr.ip).startswith("127.0")
-        assert str(addr.network).startswith("127.0")
+        if addr.version == 6:
+            assert str(addr).startswith("::1")
+            assert str(addr.ip) == "::1"
+            assert str(addr.network).startswith("::1")
+        else:
+            assert addr.version == 4
+            assert str(addr).startswith("127.")
+            assert str(addr.ip).startswith("127.0")
+            assert str(addr.network).startswith("127.0")
         if has_ipv6:
             addr = socketutil.get_interface("::1")
             assert addr.version == 6

{Pyro5-5.15 → pyro5-5.16}/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py38,py39,py310,py311,pypy3
+envlist=py310,py311,py312,py313,py314,pypy3
 
 [testenv]
 deps=