[Python-apps-commits] r14415 - in packages/sabnzbdplus/trunk/debian (4 files)

[jcfp-guest at users.alioth.debian.org]

    Date: Thursday, October 12, 2017 @ 09:43:52
  Author: jcfp-guest
Revision: 14415

switch to packaged rarfile

Modified:
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/control
  packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
  packages/sabnzbdplus/trunk/debian/rules

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2017-10-12 09:30:38 UTC (rev 14414)
+++ packages/sabnzbdplus/trunk/debian/changelog	2017-10-12 09:43:52 UTC (rev 14415)
@@ -14,7 +14,7 @@
     + update website info for rateit, codeplex is gone.
   * Patches:
     + refresh all.
-    + modify 06 to stop dealing with feedparser.
+    + modify 06 to remove feedparser, and add rarfile handling.
   * Control:
     + drop recommended dep on python-openssl: upstream switched to
       Python's builtin ssl.

Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control	2017-10-12 09:30:38 UTC (rev 14414)
+++ packages/sabnzbdplus/trunk/debian/control	2017-10-12 09:43:52 UTC (rev 14415)
@@ -33,6 +33,7 @@
  lsb-base (>= 3.0-6),
  python-cheetah (>= 2.0.1),
  python-configobj,
+ python-rarfile (>= 3.0)
  python-six
 Recommends:
  libavahi-compat-libdnssd1,

Modified: packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff	2017-10-12 09:30:38 UTC (rev 14414)
+++ packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff	2017-10-12 09:43:52 UTC (rev 14415)
@@ -10,3 +10,58 @@
  from sabnzbd.decorators import synchronized
  
  CONFIG_LOCK = threading.Lock()
+--- a/sabnzbd/assembler.py
++++ b/sabnzbd/assembler.py
+@@ -37,7 +37,7 @@
+ from sabnzbd.postproc import PostProcessor
+ import sabnzbd.downloader
+ import sabnzbd.par2file as par2file
+-import sabnzbd.utils.rarfile as rarfile
++import rarfile
+ from sabnzbd.encoding import unicoder, is_utf8
+ from sabnzbd.rating import Rating
+ 
+--- a/sabnzbd/directunpacker.py
++++ b/sabnzbd/directunpacker.py
+@@ -32,7 +32,7 @@
+ from sabnzbd.encoding import TRANS, unicoder
+ from sabnzbd.newsunpack import build_command, EXTRACTFROM_RE, rar_volumelist
+ from sabnzbd.postproc import prepare_extraction_path
+-from sabnzbd.utils.rarfile import RarFile
++from rarfile import RarFile
+ from sabnzbd.utils.diskspeed import diskspeedmeasure
+ 
+ if sabnzbd.WIN32:
+--- a/sabnzbd/dirscanner.py
++++ b/sabnzbd/dirscanner.py
+@@ -29,7 +29,7 @@
+ 
+ import sabnzbd
+ from sabnzbd.constants import SCAN_FILE_NAME, VALID_ARCHIVES
+-import sabnzbd.utils.rarfile as rarfile
++import rarfile
+ from sabnzbd.encoding import platform_encode
+ from sabnzbd.newsunpack import is_sevenfile, SevenZip
+ import sabnzbd.nzbstuff as nzbstuff
+--- a/sabnzbd/newsunpack.py
++++ b/sabnzbd/newsunpack.py
+@@ -30,7 +30,7 @@
+ 
+ import sabnzbd
+ from sabnzbd.encoding import TRANS, UNTRANS, unicoder, platform_encode, deunicode
+-import sabnzbd.utils.rarfile as rarfile
++import rarfile
+ from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \
+     real_path, globber, globber_full, get_all_passwords, renamer, clip_path, \
+     has_win_device, calc_age, long_path
+--- a/sabnzbd/postproc.py
++++ b/sabnzbd/postproc.py
+@@ -49,7 +49,7 @@
+ import sabnzbd.nzbqueue
+ import sabnzbd.database as database
+ import sabnzbd.notifier as notifier
+-import sabnzbd.utils.rarfile as rarfile
++import rarfile
+ import sabnzbd.utils.checkdir
+ 
+ # Match samples

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2017-10-12 09:30:38 UTC (rev 14414)
+++ packages/sabnzbdplus/trunk/debian/rules	2017-10-12 09:43:52 UTC (rev 14415)
@@ -30,6 +30,7 @@
 		--exclude=utils/configobj.py \
 		--exclude=utils/pystone.py \
 		--exclude=utils/systrayiconthread.py \
+		--exclude=utils/rarfile.py \
 		--exclude=sabnzbd/sabtray.py \
 		--exclude=images-split.tar.gz \
 		--exclude=cherrypy/LICENSE.txt \