Skip to content
This repository has been archived by the owner on Jun 4, 2023. It is now read-only.

Commit

Permalink
serpent 1.27 now required
Browse files Browse the repository at this point in the history
  • Loading branch information
irmen committed Aug 4, 2018
1 parent 969c9f8 commit 4d009f6
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions docs/source/changelog.rst
Expand Up @@ -4,6 +4,7 @@ Change Log

**Pyro 4.74**

- serpent 1.27 required
- fixed marshal serializer dumpsCall to be able to use the
class_to_dict conversion for unmarshallable types (in simple situations, not recursively).
This makes it possible again to use the marshal
Expand Down
2 changes: 1 addition & 1 deletion docs/source/install.rst
Expand Up @@ -62,7 +62,7 @@ Obtaining and installing Pyro
Third party libraries that Pyro4 uses
-------------------------------------

`serpent <https://pypi.python.org/pypi/serpent>`_ - required, 1.24 or newer
`serpent <https://pypi.python.org/pypi/serpent>`_ - required, 1.27 or newer
Should be installed automatically when you install Pyro4.

`selectors34 <https://pypi.python.org/pypi/selectors34>`_ - required on Python 3.3 or older
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
@@ -1,2 +1,2 @@
serpent>=1.24
serpent>=1.27
selectors34 ; python_version < "3.4"
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -46,7 +46,7 @@
"packages": ['Pyro4', 'Pyro4.socketserver', 'Pyro4.test', 'Pyro4.utils'],
"scripts": [],
"platforms": "any",
"install_requires": ["serpent>=1.24"],
"install_requires": ["serpent>=1.27"],
"extras_require": {
":python_version<'3.4'": ["selectors34"]
},
Expand Down
4 changes: 2 additions & 2 deletions src/Pyro4/util.py
Expand Up @@ -813,8 +813,8 @@ def get_serializer_by_id(sid):
else:
ver = serpent.__version__
ver = tuple(map(int, ver.split(".")))
if ver < (1, 24): # serpent 1.24 required
raise RuntimeError("requires serpent 1.24 or better")
if ver < (1, 27):
raise RuntimeError("requires serpent 1.27 or better")
_ser = SerpentSerializer()
_serializers["serpent"] = _ser
_serializers_by_id[_ser.serializer_id] = _ser
Expand Down

0 comments on commit 4d009f6

Please sign in to comment.