Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pyro.py to import Pyro5 #1675

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Update pyro.py to import Pyro5 #1675

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eae0401
Update pyro.py to import Pyro5
auvipy Mar 25, 2023
c22442e
Update pyro5 compat import
auvipy Mar 25, 2023
a432a55
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 25, 2023
1bba4be
Update pyro.py
auvipy Mar 25, 2023
b636727
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 25, 2023
f57d01e
Update pyro.py
auvipy Apr 21, 2023
5bcdcd8
Update kombu/transport/pyro.py
auvipy Apr 21, 2023
c2c3309
Update kombu/transport/pyro.py
auvipy Apr 21, 2023
4487f47
Merge branch 'main' into pyro5
auvipy Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions kombu/transport/pyro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,20 @@
import sys
from queue import Empty, Queue

from Pyro5.compatibility import Pyro4 as pyro

from kombu.exceptions import reraise
from kombu.log import get_logger
from kombu.utils.objects import cached_property

from . import virtual

try:
import Pyro4 as pyro
from Pyro4.errors import NamingError
from Pyro4.util import SerializerBase
except ImportError: # pragma: no cover
pyro = NamingError = SerializerBase = None
import Pyro5.api as pyro
from Pyro5.errors import NamingError
from Pyro5.serializers import SerializerBase
except ImportError: # pragma: no cover
auvipy marked this conversation as resolved.
Show resolved Hide resolved
pyro = NamingError = SerializerBase = None
auvipy marked this conversation as resolved.
Show resolved Hide resolved

DEFAULT_PORT = 9090
E_NAMESERVER = """\
Expand Down