From a63aed271c34eb81f0bf6aa9c62b9825d1c4929c Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Tue, 14 Jun 2016 08:43:37 -0400 Subject: [PATCH 4/4] use system rarfile --- sabnzbd/assembler.py | 3 ++- sabnzbd/dirscanner.py | 3 ++- sabnzbd/newsunpack.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sabnzbd/assembler.py b/sabnzbd/assembler.py index 7c69c68..0789540 100644 --- a/sabnzbd/assembler.py +++ b/sabnzbd/assembler.py @@ -33,6 +33,8 @@ except: import md5 new_md5 = md5.new +from rarfile import RarFile, is_rarfile + import sabnzbd from sabnzbd.misc import get_filepath, sanitize_filename, get_unique_filename, renamer, \ set_permissions, flag_file, long_path, clip_path @@ -41,7 +43,6 @@ import sabnzbd.cfg as cfg from sabnzbd.articlecache import ArticleCache from sabnzbd.postproc import PostProcessor import sabnzbd.downloader -from sabnzbd.utils.rarfile import RarFile, is_rarfile from sabnzbd.encoding import unicoder, is_utf8 from sabnzbd.rating import Rating diff --git a/sabnzbd/dirscanner.py b/sabnzbd/dirscanner.py index c573435..dcb2859 100644 --- a/sabnzbd/dirscanner.py +++ b/sabnzbd/dirscanner.py @@ -27,9 +27,10 @@ import gzip import bz2 import threading +from rarfile import is_rarfile, RarFile + import sabnzbd from sabnzbd.constants import SCAN_FILE_NAME, VALID_ARCHIVES -from sabnzbd.utils.rarfile import is_rarfile, RarFile from sabnzbd.encoding import platform_encode from sabnzbd.newsunpack import is_sevenfile, SevenZip import sabnzbd.nzbstuff as nzbstuff diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py index 7f223d9..b7fbd4f 100644 --- a/sabnzbd/newsunpack.py +++ b/sabnzbd/newsunpack.py @@ -28,10 +28,11 @@ from time import time import binascii import shutil +from rarfile import RarFile, is_rarfile + import sabnzbd from sabnzbd.encoding import TRANS, UNTRANS, unicode2local, \ reliable_unpack_names, unicoder, platform_encode, deunicode -from sabnzbd.utils.rarfile import RarFile, is_rarfile from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \ flag_file, real_path, globber, globber_full, short_path from sabnzbd.tvsort import SeriesSorter -- 2.4.10