Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
16174fe4cb |
@@ -52,8 +52,10 @@ MM_PER_INCH = 25.4
|
|||||||
# e.g.
|
# e.g.
|
||||||
# M8-1.25 - 8mm OD, 1.25 mm pitch
|
# M8-1.25 - 8mm OD, 1.25 mm pitch
|
||||||
# M8 x 1.25
|
# M8 x 1.25
|
||||||
|
# M50x.75 - No leading digit on floats
|
||||||
|
# Float pattern: \d*\.?\d+
|
||||||
_ISO_THREAD_RE = re.compile(
|
_ISO_THREAD_RE = re.compile(
|
||||||
r"^M\s*(?P<diameter>\d+(?:\.\d+)?)\s*[xX-]\s*(?P<pitch>\d+(?:\.\d+)?)(?P<extra>.*)$"
|
r"^M\s*(?P<diameter>\d*\.?\d+)\s*[xX-]\s*P?(?P<pitch>\d*\.?\d+)(?P<extra>.*)$"
|
||||||
)
|
)
|
||||||
|
|
||||||
# e.g.
|
# e.g.
|
||||||
@@ -63,7 +65,7 @@ _ISO_THREAD_RE = re.compile(
|
|||||||
#
|
#
|
||||||
# Leading digit / period, one or more digits, a dash, then
|
# Leading digit / period, one or more digits, a dash, then
|
||||||
_UNC_THREAD_RE = re.compile(
|
_UNC_THREAD_RE = re.compile(
|
||||||
r"^(?P<diameter>\d+(?:\.\d+)?(?:/\d+)?)\s*-\s*(?P<tpi>\d+)"
|
r"^(?P<diameter>\d*\.?\d+)\s*-\s*(?P<tpi>\d*\.?\d+)"
|
||||||
r"\s*(?P<series>UNEF|UNC|UNF|UNS|UN)?$",
|
r"\s*(?P<series>UNEF|UNC|UNF|UNS|UN)?$",
|
||||||
re.IGNORECASE,
|
re.IGNORECASE,
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in new issue
Block a user