Skip to content

Update cqgi for py3.14 #1986

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

Open
adam-urbanczyk wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −26
Open

Update cqgi for py3.14 #1986

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
33 changes: 7 additions & 26 deletions cadquery/cqgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def set_value(self, new_value):
else:
f = float(new_value)

self.ast_node.n = f
self.ast_node.value = f
except ValueError:
raise InvalidParameterError(
"Cannot set value '{0:s}' for parameter '{1:s}': parameter must be numeric.".format(
Expand All @@ -296,20 +296,13 @@ def set_value(self, new_value):
)

elif self.varType == StringParameterType:
self.ast_node.s = str(new_value)
self.ast_node.value = str(new_value)
elif self.varType == BooleanParameterType:
if new_value:
if hasattr(ast, "NameConstant"):
self.ast_node.value = True
else:
self.ast_node.id = "True"
self.ast_node.value = True
else:
if hasattr(ast, "NameConstant"):
self.ast_node.value = False
else:
self.ast_node.id = "False"
self.ast_node.value = False
elif self.varType == TupleParameterType:
self.ast_node.n = new_value

# Build the list of constants to set as the tuple value
constants = []
Expand Down Expand Up @@ -472,7 +465,7 @@ def visit_Call(self, node):
# first parameter is the variable,
# second is the description
varname = node.args[0].id
desc = node.args[1].s
desc = node.args[1].value
self.cqModel.add_parameter_description(varname, desc)

except:
Expand All @@ -491,19 +484,7 @@ def __init__(self, cq_model):

def handle_assignment(self, var_name, value_node):
try:
if type(value_node) == ast.Num:
self.cqModel.add_script_parameter(
InputParameter.create(
value_node, var_name, NumberParameterType, value_node.n
)
)
elif type(value_node) == ast.Str:
self.cqModel.add_script_parameter(
InputParameter.create(
value_node, var_name, StringParameterType, value_node.s
)
)
elif type(value_node) == ast.Name:
if type(value_node) == ast.Name:
if value_node.id == "True":
self.cqModel.add_script_parameter(
InputParameter.create(
Expand Down Expand Up @@ -574,7 +555,7 @@ def visit_Assign(self, node):
return

# Handle the NamedConstant type that is only present in Python 3
astTypes = [ast.Num, ast.Str, ast.Name]
astTypes = [ast.Name]
if hasattr(ast, "NameConstant"):
astTypes.append(ast.NameConstant)

Expand Down