Skip to content

Commit b917810

Browse files
committed
mypy fixes
1 parent 6ee6843 commit b917810

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

cadquery/cq.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import math
2121
from copy import copy
2222
from itertools import chain
23+
import re
2324
from typing import (
2425
overload,
2526
Sequence,
@@ -2499,9 +2500,10 @@ def eachpoint(
24992500

25002501
if combine:
25012502
compound = Compound.makeCompound(res)
2502-
res = [self._combineWithBase(compound, combine).val()]
2503+
return self._combineWithBase(compound, combine)
25032504

2504-
return self.newObject(res)
2505+
else:
2506+
return self.newObject(res)
25052507

25062508
def rect(
25072509
self: T,
@@ -4136,7 +4138,7 @@ def text(
41364138
fontsize: float,
41374139
distance: float,
41384140
cut: bool = True,
4139-
combine: bool = False,
4141+
combine: Union[bool, str] = False,
41404142
clean: Union[bool, str] = True,
41414143
font: str = "Arial",
41424144
fontPath: Optional[str] = None,

0 commit comments

Comments
 (0)