diff --git a/gooey/gui/components/options/options.py b/gooey/gui/components/options/options.py index 302ebe38..d6e2eb1e 100644 --- a/gooey/gui/components/options/options.py +++ b/gooey/gui/components/options/options.py @@ -212,7 +212,7 @@ def FilterableDropdown(placeholder=None, def PrefixSearchStrategy( choice_tokenizer=PrefixTokenizers.WORDS, - input_tokenizer=PrefixTokenizers.REGEX('\s'), + input_tokenizer=PrefixTokenizers.REGEX(r'\s'), ignore_case=True, operator='AND', index_suffix=False): @@ -300,9 +300,8 @@ def RegexValidator(test=None, message=None): """ Creates the data for a basic RegexValidator. - :param test: the regex expression. This should be the expression - directly (i.e. `test='\d+'`). Gooey will test - that the user's input satisfies this expression. + :param test: the regex expression. Gooey will test that the user's + input satisfies this expression. :param message: The message to display if the input doesn't match the regex """ diff --git a/gooey/gui/components/options/validators.py b/gooey/gui/components/options/validators.py index b6cfc149..0caf2edb 100644 --- a/gooey/gui/components/options/validators.py +++ b/gooey/gui/components/options/validators.py @@ -73,7 +73,7 @@ def is_three_channeled(value): @lift def is_hex_string(value: str): """Invalid hexadecimal format. Expected: "#FFFFFF" """ - return isinstance(value, str) and bool(re.match('^#[\dABCDEF]{6}$', value, flags=2)) + return isinstance(value, str) and bool(re.match(r'^#[\dABCDEF]{6}$', value, flags=2)) @lift diff --git a/gooey/gui/components/widgets/bases.py b/gooey/gui/components/widgets/bases.py index 11a19bf4..7259f984 100644 --- a/gooey/gui/components/widgets/bases.py +++ b/gooey/gui/components/widgets/bases.py @@ -183,7 +183,7 @@ def getUiState(self) -> t.FormField: def syncUiState(self, state: FormField): # type: ignore self.widget.setValue(state['value']) # type: ignore self.error.SetLabel(state['error'] or '') - self.error.Show(state['error'] is not None and state['error'] is not '') + self.error.Show(state['error'] is not None and state['error'] != '') def getValue(self) -> t.FieldValue: diff --git a/gooey/gui/components/widgets/checkbox.py b/gooey/gui/components/widgets/checkbox.py index 219db409..df741773 100644 --- a/gooey/gui/components/widgets/checkbox.py +++ b/gooey/gui/components/widgets/checkbox.py @@ -71,7 +71,7 @@ def syncUiState(self, state: t.Checkbox): # type: ignore checkbox.Enable(state['enabled']) self.Show(state['visible']) self.error.SetLabel(state['error'] or '') - self.error.Show(state['error'] is not None and state['error'] is not '') + self.error.Show(state['error'] is not None and state['error'] != '') @@ -125,4 +125,4 @@ def arrange(self, *args, **kwargs): layout.Add(hsizer, 1, wx.EXPAND) layout.AddSpacer(2) - return layout \ No newline at end of file + return layout diff --git a/gooey/gui/components/widgets/dropdown.py b/gooey/gui/components/widgets/dropdown.py index f43d4a29..6e30a4cb 100644 --- a/gooey/gui/components/widgets/dropdown.py +++ b/gooey/gui/components/widgets/dropdown.py @@ -52,7 +52,7 @@ def syncUiState(self, state: FormField): if state['selected'] is not None: # type: ignore self.setValue(state['selected']) # type: ignore self.error.SetLabel(state['error'] or '') - self.error.Show(state['error'] is not None and state['error'] is not '') + self.error.Show(state['error'] is not None and state['error'] != '') def getUiState(self) -> t.FormField: widget: wx.ComboBox = self.widget diff --git a/gooey/gui/components/widgets/dropdown_filterable.py b/gooey/gui/components/widgets/dropdown_filterable.py index 51bc45c9..740087f8 100644 --- a/gooey/gui/components/widgets/dropdown_filterable.py +++ b/gooey/gui/components/widgets/dropdown_filterable.py @@ -128,7 +128,7 @@ def syncUiState(self, state: t.DropdownFilterable): # type: ignore if state['value'] is not None: self.setValue(state['value']) self.error.SetLabel(state['error'] or '') - self.error.Show(state['error'] is not None and state['error'] is not '') + self.error.Show(state['error'] is not None and state['error'] != '') def OnGetItem(self, n): return self.model.suggestions[n] diff --git a/gooey/gui/components/widgets/listbox.py b/gooey/gui/components/widgets/listbox.py index c3f4143b..e70a5f25 100644 --- a/gooey/gui/components/widgets/listbox.py +++ b/gooey/gui/components/widgets/listbox.py @@ -51,4 +51,4 @@ def syncUiState(self, state: t.Listbox): # type: ignore for string in state['selected']: widget.SetStringSelection(string) self.error.SetLabel(state['error'] or '') - self.error.Show(state['error'] is not None and state['error'] is not '') + self.error.Show(state['error'] is not None and state['error'] != '') diff --git a/gooey/gui/components/widgets/textarea.py b/gooey/gui/components/widgets/textarea.py index 27dc42af..21b913bb 100644 --- a/gooey/gui/components/widgets/textarea.py +++ b/gooey/gui/components/widgets/textarea.py @@ -41,7 +41,7 @@ def formatOutput(self, metatdata, value: str): def syncUiState(self, state: FormField): self.setValue(state['value']) # type: ignore self.error.SetLabel(state['error'] or '') - self.error.Show(state['error'] is not None and state['error'] is not '') + self.error.Show(state['error'] is not None and state['error'] != '') def getUiState(self) -> t.FormField: return t.TextField( diff --git a/gooey/gui/components/widgets/textfield.py b/gooey/gui/components/widgets/textfield.py index 5b5955a1..3e6cab4c 100644 --- a/gooey/gui/components/widgets/textfield.py +++ b/gooey/gui/components/widgets/textfield.py @@ -27,5 +27,5 @@ def syncUiState(self, state: t.TextField): # type: ignore textctr.Enable(state['enabled']) self.Show(state['visible']) self.error.SetLabel(state['error'] or '') - self.error.Show(state['error'] is not None and state['error'] is not '') + self.error.Show(state['error'] is not None and state['error'] != '') self.Layout()