diff options
author | 2015-04-08 01:58:10 +0200 | |
---|---|---|
committer | 2015-04-08 01:58:10 +0200 | |
commit | a59784a64f8afdca1642a0e53a396548a8608d61 (patch) | |
tree | a7eb9914bbc55bbc46f5a5f6929c6c6c95c81244 /module/plugins/hooks/MergeFiles.py | |
parent | Fixed RemixshareCom (diff) | |
parent | [ExtractArchive] Fix https://github.com/pyload/pyload/issues/1322 (diff) | |
download | pyload-a59784a64f8afdca1642a0e53a396548a8608d61.tar.xz |
Merge pull request #1 from pyload/stable
merge with base
Diffstat (limited to 'module/plugins/hooks/MergeFiles.py')
-rw-r--r-- | module/plugins/hooks/MergeFiles.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py index 2900b0d29..941938920 100644 --- a/module/plugins/hooks/MergeFiles.py +++ b/module/plugins/hooks/MergeFiles.py @@ -4,8 +4,7 @@ from __future__ import with_statement import os import re - -from traceback import print_exc +import traceback from module.plugins.Hook import Hook, threaded from module.utils import save_join @@ -75,7 +74,7 @@ class MergeFiles(Hook): self.logDebug("Finished merging part", splitted_file) except Exception, e: - print_exc() + traceback.print_exc() finally: pyfile.setProgress(100) |