From 30a43e0c85e416647c9d178a062f3fa503dcddcd Mon Sep 17 00:00:00 2001 From: mfrasca Date: Tue, 2 Jan 2018 13:46:40 -0500 Subject: [PATCH] close #301. changing as suggested. --- bauble/plugins/plants/__init__.py | 5 ----- bauble/plugins/plants/test.py | 7 ------- 2 files changed, 12 deletions(-) diff --git a/bauble/plugins/plants/__init__.py b/bauble/plugins/plants/__init__.py index a18e1dbb8..9c6b0b2f8 100755 --- a/bauble/plugins/plants/__init__.py +++ b/bauble/plugins/plants/__init__.py @@ -367,11 +367,6 @@ def init(cls): bauble.gui.add_to_insert_menu(GenusEditor, _('Genus')) bauble.gui.add_to_insert_menu(SpeciesEditorMenuItem, _('Species')) - if sys.platform == 'win32': - # TODO: for some reason using the cross as the hybrid - # character doesn't work on windows - Species.hybrid_char = 'x' - # suggest some useful defaults for stored queries import bauble.meta as meta session = db.Session() diff --git a/bauble/plugins/plants/test.py b/bauble/plugins/plants/test.py index 0676a088f..bea34e694 100644 --- a/bauble/plugins/plants/test.py +++ b/bauble/plugins/plants/test.py @@ -65,13 +65,6 @@ from bauble.plugins.plants.species_model import _remove_zws as remove_zws -if sys.platform == 'win32': - # on windows the hybrid char is set to 'x'in PlantPlugin.init but - # these strings are initialized before init is called so we set it - # here...this sort of breaks the string tests since we aren't - # relying on the behavior of PlantPlugin.init but what can we do? - Species.hybrid_char = 'x' - family_test_data = ( {'id': 1, 'family': u'Orchidaceae'},