Skip to content

Global commands: restore commands affected by division operator differences between Python 2 and 3 #9748

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

Merged
michaelDCurran merged 2 commits into from
Jun 15, 2019
Merged

Global commands: restore commands affected by division operator differences between Python 2 and 3 #9748

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
365caf5
Global commands/mouse to navigator object: use two slashes to guarant…
josephsl Jun 15, 2019
6323548
Global commands/battery status: hours and minutes must be integers. R…
josephsl Jun 15, 2019
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
6 changes: 3 additions & 3 deletions source/globalCommands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,8 +707,8 @@ def script_moveMouseToNavigatorObject(self,gesture):
# Translators: Reported when the object has no location for the mouse to move to it.
ui.message(_("Object has no location"))
return
x=left+(width/2)
y=top+(height/2)
x=left+(width//2)
y=top+(height//2)
winUser.setCursorPos(x,y)
mouseHandler.executeMouseMoveEvent(x,y)
# Translators: Input help mode message for move mouse to navigator object command.
Expand Down Expand Up @@ -1639,7 +1639,7 @@ def script_say_battery_status(self,gesture):
if sps.ACLineStatus & AC_ONLINE: text += _("AC power on")
elif sps.BatteryLifeTime!=0xffffffff:
# Translators: This is the estimated remaining runtime of the laptop battery.
text += _("{hours:d} hours and {minutes:d} minutes remaining") .format(hours=sps.BatteryLifeTime / 3600, minutes=(sps.BatteryLifeTime % 3600) / 60)
text += _("{hours:d} hours and {minutes:d} minutes remaining") .format(hours=sps.BatteryLifeTime // 3600, minutes=(sps.BatteryLifeTime % 3600) // 60)
ui.message(text)
# Translators: Input help mode message for report battery status command.
script_say_battery_status.__doc__ = _("Reports battery status and time remaining if AC is not plugged in")
Expand Down