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

Jump to bottom

Fix deprecation warning on regex #654

Merged
merged 2 commits into from
Feb 26, 2021
Merged

Fix deprecation warning on regex #654

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a57e69a
Fix deprecation warning on regex
RubenRubens Feb 1, 2021
112024d
Escape pipe symbol in selector docstrings
marcus7070 Feb 25, 2021
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: 6 additions & 6 deletions cadquery/selectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def filter(self, objectList: Sequence[Shape]) -> List[Shape]:


class ParallelDirSelector(BaseDirSelector):
"""
r"""
Selects objects parallel with the provided direction.

Applicability:
Expand Down Expand Up @@ -677,9 +677,9 @@ def _getVector(self, pr):
return self.axes[pr.simple_dir]

def filter(self, objectList):
"""
r"""
selects minimum, maximum, positive or negative values relative to a direction
[+\|-\|<\|>\|] \<X\|Y\|Z>
``[+|-|<|>|] <X|Y|Z>``
"""
return self.mySelector.filter(objectList)

Expand Down Expand Up @@ -740,7 +740,7 @@ def not_callback(res):


class StringSyntaxSelector(Selector):
"""
r"""
Filter lists objects using a simple string syntax. All of the filters available in the string syntax
are also available ( usually with more functionality ) through the creation of full-fledged
selector objects. see :py:class:`Selector` and its subclasses
Expand Down Expand Up @@ -776,11 +776,11 @@ class StringSyntaxSelector(Selector):
:and:
Logical AND, e.g. >X and >Y
:or:
Logical OR, e.g. |X or |Y
Logical OR, e.g. \|X or \|Y
:not:
Logical NOT, e.g. not #XY
:exc(ept):
Set difference (equivalent to AND NOT): |X exc >Z
Set difference (equivalent to AND NOT): \|X exc >Z

Finally, it is also possible to use even more complex expressions with nesting
and arbitrary number of terms, e.g.
Expand Down