Skip to content

2.9 Fix: Replace deprecated 'locale.format()' #4250

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
Sigma1912 wants to merge 1 commit into
base: 2.9
Choose a base branch
from
+5 −5
Open

2.9 Fix: Replace deprecated 'locale.format()' #4250

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions lib/python/gladevcp/calculatorwidget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,11 @@ def displayAdd( self, widget ):
self.displayOperand( "+" )

def displayMmInch( self, widget ):
self.eval_string = "("+ self.eval_string + ") / " + locale.format("%f", float(25.4))
self.eval_string = "("+ self.eval_string + ") / " + locale.format_string("%f", float(25.4))
self.compute()

def displayInchMm( self, widget ):
self.eval_string = "("+ self.eval_string + ") * " + locale.format("%f", float(25.4))
self.eval_string = "("+ self.eval_string + ") * " + locale.format_string("%f", float(25.4))
self.compute()

def on_ok_button_clicked ( self, widget ):
Expand Down
2 changes: 1 addition & 1 deletion lib/python/gladevcp/offsetpage_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def system_to_p(system):
return
# set the text in the table
try:
self.store[row][col] = locale.format("%10.4f", locale.atof(new_text))
self.store[row][col] = locale.format_string("%10.4f", locale.atof(new_text))
except:
print(_("offsetpage widget error: unrecognized float input"))
# make sure we switch to correct units for machine and rotational, row 2, does not get converted
Expand Down
2 changes: 1 addition & 1 deletion lib/python/gladevcp/tooledit_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ def col_editted(self, widget, path, new_text, col, filter):
# validate input for float columns
elif col in range(3,15):
try:
self.model[path][col] = locale.format("%10.4f",locale.atof(new_text))
self.model[path][col] = locale.format_string("%10.4f",locale.atof(new_text))
except:
pass
# validate input for orientation: check if int and valid range
Expand Down
2 changes: 1 addition & 1 deletion src/emc/usr_intf/pncconf/pncconf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4865,7 +4865,7 @@ def get(n): return get_value(w[n])

encoder_cpr = get_value(w[("encoderline")]) * 4
encoder_scale = (encoder_pulley_ratio * encoder_worm_ratio * encoder_pitch * encoder_cpr) / rotary_scale
w["calcencoder_scale"].set_text(locale.format("%.4f", (encoder_scale)))
w["calcencoder_scale"].set_text(locale.format_string("%.4f", (encoder_scale)))
else:
w["calcencoder_scale"].set_sensitive(False)
w["encoderscaleframe"].set_sensitive(False)
Expand Down
Loading