Skip to content

Import ABC from collections.abc for Python 3.10 compatibility. #307

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

Merged
merged 1 commit into from
Mar 21, 2022
Merged

Import ABC from collections.abc for Python 3.10 compatibility. #307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pypot/utils/trajectory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


import numpy
import collections
import collections.abc

import pypot.utils.pypot_time as time
from ..utils.stoppablethread import StoppableLoopThread
Expand Down Expand Up @@ -42,7 +42,7 @@ def get_value(self, t):
return self._mygenerator[-1](t)

def domain(self, x):
if not isinstance(x, collections.Iterable):
if not isinstance(x, collections.abc.Iterable):
x = numpy.array([x])

return numpy.array([
Expand All @@ -54,7 +54,7 @@ def test_domain(self, x):
return [((numpy.array(x) >= self.durations[i])) for i in range(len(self.durations) - 1)]

def fix_input(self, x):
return x if isinstance(x, collections.Iterable) else numpy.array([0, x])
return x if isinstance(x, collections.abc.Iterable) else numpy.array([0, x])

def get_generator(self):
return lambda x: numpy.piecewise(x, self.domain(x), [self._generators[j] for j in range(len(self._generators))] + [self.finals[-1]])
Expand Down