Skip to content

Commit

Permalink
fix getFolderList() error
Browse files Browse the repository at this point in the history
the "folder" arg got from menotexport-gui.py is a tuple,
properly address that after removing pandas dependency.
  • Loading branch information
Xunius committed Aug 7, 2018
1 parent ff62727 commit 2df9a39
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
1 change: 0 additions & 1 deletion menotexport-gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import Queue
import threading
import sqlite3
#import pandas as pd
if sys.version_info[0]>=3:
import tkinter as tk
from tkinter import Frame
Expand Down
5 changes: 3 additions & 2 deletions menotexport.py
Original file line number Diff line number Diff line change
Expand Up @@ -826,10 +826,11 @@ def getFolderList(db,folder,verbose=True):
if type(folder) is str:
folderids=db.execute(query1).fetchall()
folderids=[ii[0] for ii in folderids]
elif type(folder) is tuple or type(folder) is list:
raise Exception("Not implemented")
elif isinstance(folder, (tuple,list)):
# get folder from gui
#seldf=df[(df.folderid==folder[0]) & (df.folder==folder[1])]
#folderids=fetchField(seldf,'folderid')
folderids=[folder[0]]

#----------------Get all subfolders----------------
if folder is not None:
Expand Down

0 comments on commit 2df9a39

Please sign in to comment.