marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

[change] parameter evtdata of class Data has to be called as str object

Browse Source 
(instead of outdated basestring) to make the class python 3 compatible
This commit is contained in:
Marcel Paffrath 2017-07-14 13:30:54 +02:00
parent 20e86cee5a
commit 227112cbac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QtPyLoT.py
View File

@ -716,7 +716,7 @@ class MainWindow(QMainWindow):
event = self.get_current_event() event = self.get_current_event()
data = Data(self, event) data = Data(self, event)
try: try:
data_new = Data(self, evtdata=fname) data_new = Data(self, evtdata=str(fname))
data += data_new data += data_new
except ValueError: except ValueError:
qmb = QMessageBox(self, icon=QMessageBox.Question, qmb = QMessageBox(self, icon=QMessageBox.Question,

2
pylot/core/io/data.py
View File

@ -39,7 +39,7 @@ class Data(object):
elif isinstance(evtdata, dict): elif isinstance(evtdata, dict):
evt = readPILOTEvent(**evtdata) evt = readPILOTEvent(**evtdata)
evtdata = evt evtdata = evt
elif isinstance(evtdata, basestring): elif isinstance(evtdata, str):
try: try:
cat = read_events(evtdata) cat = read_events(evtdata)
if len(cat) is not 1: if len(cat) is not 1: