diff options
author | Fred Wright <fw@fwright.net> | 2016-04-08 10:07:49 -0700 |
---|---|---|
committer | Eric S. Raymond <esr@thyrsus.com> | 2016-04-09 04:39:16 -0400 |
commit | d79ddb4f02f8800fe601a5b7f4b1aaae8990ca7c (patch) | |
tree | 89a5486093010ea4bf93bc291c669191044f0d36 /xgps | |
parent | 6f313def5abd4c914366ca171ebae654b06aa01f (diff) | |
download | gpsd-d79ddb4f02f8800fe601a5b7f4b1aaae8990ca7c.tar.gz |
Removes unnecessary Unicode literal from xgps.
Since the radio-button labels in the add_ui_from_string() text are
just internal labels not visible to the user, there's no reason that
they need to rely on non-USASCII characters. With that text confined
to 7-bit ASCII, there's no need to use Unicode for the literal, which
in turn eliminates the last incompatibility with Python 3.2. Note
that this isn't the only case where the internal labels mismatch the
user-visible text (the other ones involve embedded blanks).
The fact that Gtk3 assumes 'ascii' for the encoding in this case may
actually be a bug.
TESTED:
Ran xgps with Python 2.7 and 3.2-3.5 (using appropriately built
extensions).
Diffstat (limited to 'xgps')
-rwxr-xr-x | xgps | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -510,12 +510,12 @@ class Base: 'Metric Units', 2), ], 0, lambda a, _unused: self.set_units(['i', 'n', 'm'][a.get_current_value()])) self.actiongroup.add_radio_actions( - [('30°', None, '30°', None, '30°', 30), - ('45°', None, '45°', None, '45°', 45), + [('30deg', None, '30°', None, '30°', 30), + ('45deg', None, '45°', None, '45°', 45), ('Off', None, 'Off', None, 'Off', 0), ], 45, lambda a, _unused: self.set_step_of_grid(a.get_current_value())) self.uimanager.insert_action_group(self.actiongroup, 0) - self.uimanager.add_ui_from_string(u''' + self.uimanager.add_ui_from_string(''' <ui> <menubar name="MenuBar"> <menu action="File"> @@ -535,8 +535,8 @@ class Base: <menuitem action="Metric"/> </menu> <menu action="Step of grid"> - <menuitem action="30°"/> - <menuitem action="45°"/> + <menuitem action="30deg"/> + <menuitem action="45deg"/> <menuitem action="Off"/> </menu> </menubar> |