Skip to content

Commit e025ab5

Browse files
committed
Fix isnumeric error, enhanced status bar import
1 parent 8228fa1 commit e025ab5

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

evora/client/gui/gui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# always goes after wxreactor install
2121

2222
wxreactor.install()
23-
import enhanced_status_bar
23+
from evora.client.gui import enhanced_status_bar
2424
from twisted.internet import defer, protocol, reactor
2525
from twisted.protocols import basic
2626
# FTP Client Things

evora/common/classes/acquisition.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import evora.common.logging.my_logger as my_logger
1616
import evora.common.utils.fits as fits_utils
1717
import evora.common.utils.logs as log_utils
18+
import evora.client.gui.enhanced_status_bar as EnhancedStatusBar
1819

1920
__author__ = "Tristan J. Hillis"
2021

@@ -352,7 +353,8 @@ def onExpose(self, event):
352353

353354
# if statement here is more for redundancy. The above MessageDialogs let the user their input is incorrect,
354355
# else they will enter this if statement just fine.
355-
if self.timeToSend.isnumeric() and self.nameToSend != "" and lessThanZero:
356+
# isnumeric() only defined for utf-8 strings, convert before checking
357+
if unicode(str(self.timeToSend), 'utf-8').isnumeric() and self.nameToSend != "" and lessThanZero:
356358

357359
line = self.getAttributesToSend().split()
358360

0 commit comments

Comments
 (0)