diff options
| author | Paweł Jastrzębski <pawelj@iosphe.re> | 2017-03-11 19:43:32 +0100 |
|---|---|---|
| committer | Paweł Jastrzębski <pawelj@iosphe.re> | 2017-03-12 13:29:10 +0100 |
| commit | d2c12c89e6f759cd3f98c53220c48a7eddfcf774 (patch) | |
| tree | dadb5a09db85b5247cdf971c35a4f2b1a2945b3c /kindlecomicconverter/comic2panel.py | |
| parent | Updated README + version bump (diff) | |
| download | kcc-d2c12c89e6f759cd3f98c53220c48a7eddfcf774.tar.gz kcc-d2c12c89e6f759cd3f98c53220c48a7eddfcf774.tar.bz2 kcc-d2c12c89e6f759cd3f98c53220c48a7eddfcf774.zip | |
Updated dependencies
Diffstat (limited to 'kindlecomicconverter/comic2panel.py')
| -rw-r--r-- | kindlecomicconverter/comic2panel.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kindlecomicconverter/comic2panel.py b/kindlecomicconverter/comic2panel.py index 522587c..6ccdcbc 100644 --- a/kindlecomicconverter/comic2panel.py +++ b/kindlecomicconverter/comic2panel.py @@ -29,10 +29,6 @@ try: from PyQt5 import QtCore except ImportError: QtCore = None -try: - from scandir import walk -except ImportError: - walk = os.walk def mergeDirectoryTick(output): @@ -250,7 +246,7 @@ def main(argv=None, qtGUI=None): mergeWorkerOutput = [] mergeWorkerPool = Pool() mergeWork.append([options.targetDir]) - for root, dirs, files in walk(options.targetDir, False): + for root, dirs, files in os.walk(options.targetDir, False): dirs, files = walkSort(dirs, files) for directory in dirs: directoryNumer += 1 @@ -269,7 +265,7 @@ def main(argv=None, qtGUI=None): rmtree(options.targetDir, True) raise RuntimeError("One of workers crashed. Cause: " + mergeWorkerOutput[0][0], mergeWorkerOutput[0][1]) print("Splitting images...") - for root, dirs, files in walk(options.targetDir, False): + for root, dirs, files in os.walk(options.targetDir, False): for name in files: if getImageFileName(name) is not None: pagenumber += 1 |