[Python-modules-commits] r32647 - in packages/subliminal/trunk/debian (7 files)
emillon-guest at users.alioth.debian.org
emillon-guest at users.alioth.debian.org
Sun May 10 16:18:30 UTC 2015
Date: Sunday, May 10, 2015 @ 16:18:29
Author: emillon-guest
Revision: 32647
subliminal: new upstream version
Modified:
packages/subliminal/trunk/debian/changelog
packages/subliminal/trunk/debian/patches/bounds.patch
packages/subliminal/trunk/debian/patches/charade.patch
packages/subliminal/trunk/debian/patches/python3.patch
packages/subliminal/trunk/debian/patches/series
Deleted:
packages/subliminal/trunk/debian/patches/babelfish.patch
packages/subliminal/trunk/debian/patches/guessit.patch
Modified: packages/subliminal/trunk/debian/changelog
===================================================================
--- packages/subliminal/trunk/debian/changelog 2015-05-10 15:45:59 UTC (rev 32646)
+++ packages/subliminal/trunk/debian/changelog 2015-05-10 16:18:29 UTC (rev 32647)
@@ -1,8 +1,9 @@
-subliminal (0.7.4-2) UNRELEASED; urgency=medium
+subliminal (0.7.5-1) UNRELEASED; urgency=medium
* debian/watch: use pypi redirector
+ * New upstream release
- -- Etienne Millon <me at emillon.org> Thu, 05 Feb 2015 21:21:07 +0100
+ -- Etienne Millon <me at emillon.org> Sun, 10 May 2015 17:57:52 +0200
subliminal (0.7.4-1) unstable; urgency=low
Deleted: packages/subliminal/trunk/debian/patches/babelfish.patch
===================================================================
--- packages/subliminal/trunk/debian/patches/babelfish.patch 2015-05-10 15:45:59 UTC (rev 32646)
+++ packages/subliminal/trunk/debian/patches/babelfish.patch 2015-05-10 16:18:29 UTC (rev 32647)
@@ -1,120 +0,0 @@
-Origin: upstream, commit:f0519bbe commit:5e26185c
-Description: fixes for babelfish 0.5.1
-
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -4,6 +4,6 @@
- enzyme>=0.4.0
- html5lib>=0.99
- dogpile.cache>=0.5.2
--babelfish>=0.4.0
-+babelfish>=0.5.1
- chardet>=1.0.3
- pysrt>=0.5.0
---- a/setup.py
-+++ b/setup.py
-@@ -31,10 +31,7 @@
- 'opensubtitles = subliminal.providers.opensubtitles:OpenSubtitlesProvider',
- 'podnapisi = subliminal.providers.podnapisi:PodnapisiProvider',
- 'thesubdb = subliminal.providers.thesubdb:TheSubDBProvider',
-- 'tvsubtitles = subliminal.providers.tvsubtitles:TVsubtitlesProvider'],
-- 'babelfish.language_converters': ['addic7ed = subliminal.converters.addic7ed:Addic7edConverter',
-- 'podnapisi = subliminal.converters.podnapisi:PodnapisiConverter',
-- 'tvsubtitles = subliminal.converters.tvsubtitles:TVsubtitlesConverter']
-+ 'tvsubtitles = subliminal.providers.tvsubtitles:TVsubtitlesProvider']
- },
- install_requires=open('requirements.txt').readlines(),
- test_suite='subliminal.tests.suite')
---- a/subliminal/converters/addic7ed.py
-+++ b/subliminal/converters/addic7ed.py
-@@ -1,11 +1,11 @@
- # -*- coding: utf-8 -*-
- from __future__ import unicode_literals
--from babelfish import LanguageReverseConverter, get_language_converter
-+from babelfish import LanguageReverseConverter, language_converters
-
-
- class Addic7edConverter(LanguageReverseConverter):
- def __init__(self):
-- self.name_converter = get_language_converter('name')
-+ self.name_converter = language_converters['name']
- self.from_addic7ed = {'Català ': ('cat',), 'Chinese (Simplified)': ('zho',), 'Chinese (Traditional)': ('zho',),
- 'Euskera': ('eus',), 'Galego': ('glg',), 'Greek': ('ell',), 'Malay': ('msa',),
- 'Portuguese (Brazilian)': ('por', 'BR'), 'Serbian (Cyrillic)': ('srp', None, 'Cyrl'),
---- a/subliminal/converters/tvsubtitles.py
-+++ b/subliminal/converters/tvsubtitles.py
-@@ -1,11 +1,11 @@
- # -*- coding: utf-8 -*-
- from __future__ import unicode_literals
--from babelfish import LanguageReverseConverter, get_language_converter
-+from babelfish import LanguageReverseConverter, language_converters
-
-
- class TVsubtitlesConverter(LanguageReverseConverter):
- def __init__(self):
-- self.alpha2_converter = get_language_converter('alpha2')
-+ self.alpha2_converter = language_converters['alpha2']
- self.from_tvsubtitles = {'br': ('por', 'BR'), 'ua': ('ukr',), 'gr': ('ell',), 'cn': ('zho',), 'jp': ('jpn',),
- 'cz': ('ces',)}
- self.to_tvsubtitles = {v: k for k, v in self.from_tvsubtitles}
---- a/subliminal/providers/addic7ed.py
-+++ b/subliminal/providers/addic7ed.py
-@@ -14,6 +14,7 @@
-
-
- logger = logging.getLogger(__name__)
-+babelfish.language_converters.register('addic7ed = subliminal.converters.addic7ed:Addic7edConverter')
-
-
- class Addic7edSubtitle(Subtitle):
---- a/subliminal/providers/podnapisi.py
-+++ b/subliminal/providers/podnapisi.py
-@@ -18,6 +18,7 @@
-
-
- logger = logging.getLogger(__name__)
-+babelfish.language_converters.register('podnapisi = subliminal.converters.podnapisi:PodnapisiConverter')
-
-
- class PodnapisiSubtitle(Subtitle):
-@@ -67,7 +68,7 @@
-
-
- class PodnapisiProvider(Provider):
-- languages = {babelfish.Language.frompodnapisi(l) for l in babelfish.get_language_converter('podnapisi').codes}
-+ languages = {babelfish.Language.frompodnapisi(l) for l in babelfish.language_converters['podnapisi'].codes}
- video_types = (Episode, Movie)
- server = 'http://simple.podnapisi.net'
- link_re = re.compile('^.*(?P<link>/ppodnapisi/download/i/\d+/k/.*$)')
---- a/subliminal/providers/tvsubtitles.py
-+++ b/subliminal/providers/tvsubtitles.py
-@@ -17,6 +17,7 @@
-
-
- logger = logging.getLogger(__name__)
-+babelfish.language_converters.register('tvsubtitles = subliminal.converters.tvsubtitles:TVsubtitlesConverter')
-
-
- class TVsubtitlesSubtitle(Subtitle):
---- a/subliminal/video.py
-+++ b/subliminal/video.py
-@@ -156,7 +156,7 @@
- :rtype: set
-
- """
-- language_extensions = tuple('.' + c for c in babelfish.get_language_converter('alpha2').codes)
-+ language_extensions = tuple('.' + c for c in babelfish.language_converters['alpha2'].codes)
- dirpath, filename = os.path.split(path)
- subtitles = set()
- for p in os.listdir(dirpath):
---- a/subliminal/providers/opensubtitles.py
-+++ b/subliminal/providers/opensubtitles.py
-@@ -83,7 +83,7 @@
-
-
- class OpenSubtitlesProvider(Provider):
-- languages = {babelfish.Language.fromopensubtitles(l) for l in babelfish.get_language_converter('opensubtitles').codes}
-+ languages = {babelfish.Language.fromopensubtitles(l) for l in babelfish.language_converters['opensubtitles'].codes}
-
- def __init__(self):
- self.server = ServerProxy('http://api.opensubtitles.org/xml-rpc', transport=TimeoutTransport(10))
Modified: packages/subliminal/trunk/debian/patches/bounds.patch
===================================================================
--- packages/subliminal/trunk/debian/patches/bounds.patch 2015-05-10 15:45:59 UTC (rev 32646)
+++ packages/subliminal/trunk/debian/patches/bounds.patch 2015-05-10 16:18:29 UTC (rev 32647)
@@ -5,15 +5,10 @@
--- a/requirements.txt
+++ b/requirements.txt
-@@ -1,9 +1,9 @@
+@@ -1,5 +1,5 @@
beautifulsoup4>=4.3.2
--guessit>=0.6.2,<0.7
-+guessit>=0.6.2
+-guessit>=0.7,<0.10
++guessit>=0.7
requests>=2.0.1
enzyme>=0.4.0
html5lib>=0.99
- dogpile.cache>=0.5.2
--babelfish>=0.4.0,<0.5
-+babelfish>=0.4.0
- chardet>=1.0.3
- pysrt>=0.5.0
Modified: packages/subliminal/trunk/debian/patches/charade.patch
===================================================================
--- packages/subliminal/trunk/debian/patches/charade.patch 2015-05-10 15:45:59 UTC (rev 32646)
+++ packages/subliminal/trunk/debian/patches/charade.patch 2015-05-10 16:18:29 UTC (rev 32647)
@@ -14,18 +14,7 @@
+import chardet as charade
import requests
from . import Provider
- from .. import __version__
---- a/subliminal/providers/bierdopje.py
-+++ b/subliminal/providers/bierdopje.py
-@@ -3,7 +3,7 @@
- import logging
- import urllib
- import babelfish
--import charade
-+import chardet as charade
- import guessit
- import requests
- import xml.etree.ElementTree
+ from ..cache import region
--- a/subliminal/providers/opensubtitles.py
+++ b/subliminal/providers/opensubtitles.py
@@ -7,7 +7,7 @@
@@ -39,7 +28,7 @@
from .. import __version__
--- a/subliminal/providers/podnapisi.py
+++ b/subliminal/providers/podnapisi.py
-@@ -7,7 +7,7 @@
+@@ -8,7 +8,7 @@
import zipfile
import babelfish
import bs4
@@ -61,7 +50,7 @@
from .. import __version__
--- a/subliminal/providers/tvsubtitles.py
+++ b/subliminal/providers/tvsubtitles.py
-@@ -6,7 +6,7 @@
+@@ -7,7 +7,7 @@
import zipfile
import babelfish
import bs4
@@ -69,13 +58,13 @@
+import chardet as charade
import requests
from . import Provider
- from .. import __version__
+ from ..cache import region
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@
html5lib>=0.99
dogpile.cache>=0.5.2
- babelfish>=0.4.0,<0.5
+ babelfish>=0.5.0
-charade>=1.0.3
+chardet>=1.0.3
pysrt>=0.5.0
Deleted: packages/subliminal/trunk/debian/patches/guessit.patch
===================================================================
--- packages/subliminal/trunk/debian/patches/guessit.patch 2015-05-10 15:45:59 UTC (rev 32646)
+++ packages/subliminal/trunk/debian/patches/guessit.patch 2015-05-10 16:18:29 UTC (rev 32647)
@@ -1,34 +0,0 @@
-Origin: upstream, commit:c142233f, commit:5ffa344f
-Description: fixes for guessit 0.7
-
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,5 +1,5 @@
- beautifulsoup4>=4.3.2
--guessit>=0.6.2
-+guessit>=0.7
- requests>=2.0.1
- enzyme>=0.4.0
- html5lib>=0.99
---- a/subliminal/video.py
-+++ b/subliminal/video.py
-@@ -182,7 +182,7 @@
- """
- dirpath, filename = os.path.split(path)
- logger.info('Scanning video %r in %r', filename, dirpath)
-- video = Video.fromguess(path, guessit.guess_file_info(path, 'autodetect'))
-+ video = Video.fromguess(path, guessit.guess_file_info(path))
- video.size = os.path.getsize(path)
- if video.size > 10485760:
- logger.debug('Size is %d', video.size)
---- a/subliminal/cli.py
-+++ b/subliminal/cli.py
-@@ -147,7 +147,7 @@
- embedded_subtitles=not args.force, age=args.age)
-
- # guess videos
-- videos.extend([Video.fromguess(os.path.split(p)[1], guessit.guess_file_info(p, 'autodetect')) for p in args.paths
-+ videos.extend([Video.fromguess(os.path.split(p)[1], guessit.guess_file_info(p)) for p in args.paths
- if not os.path.exists(p)])
-
- # download best subtitles
Modified: packages/subliminal/trunk/debian/patches/python3.patch
===================================================================
--- packages/subliminal/trunk/debian/patches/python3.patch 2015-05-10 15:45:59 UTC (rev 32646)
+++ packages/subliminal/trunk/debian/patches/python3.patch 2015-05-10 16:18:29 UTC (rev 32647)
@@ -19,9 +19,9 @@
+from ..compat import ServerProxy, TimeoutTransport
from ..exceptions import ProviderError, ProviderNotAvailable, InvalidSubtitle
from ..subtitle import Subtitle, is_valid_subtitle, compute_guess_matches
- from ..video import Episode, Movie
-@@ -86,7 +86,7 @@
- languages = {babelfish.Language.fromopensubtitles(l) for l in babelfish.get_language_converter('opensubtitles').codes}
+ from ..subtitle import sanitize_string
+@@ -91,7 +91,7 @@
+ languages = set([babelfish.Language.fromopensubtitles(l) for l in babelfish.language_converters['opensubtitles'].codes])
def __init__(self):
- self.server = xmlrpclib.ServerProxy('http://api.opensubtitles.org/xml-rpc')
@@ -35,8 +35,8 @@
elif r.status_code != 200:
raise ProviderError('Request failed with status code %d' % r.status_code)
return [TheSubDBSubtitle(language, hash) for language in
-- {babelfish.Language.fromalpha2(l) for l in r.content.split(',')}]
-+ {babelfish.Language.fromalpha2(l) for l in r.content.decode('utf-8').split(',')}]
+- set([babelfish.Language.fromalpha2(l) for l in r.content.split(',')])]
++ set([babelfish.Language.fromalpha2(l) for l in r.content.decode('utf-8').split(',')])]
def list_subtitles(self, video, languages):
return [s for s in self.query(video.hashes['thesubdb']) if s.language in languages]
@@ -51,7 +51,7 @@
help='minimum score for subtitles (0-%d for episodes, 0-%d for movies)'
% (Episode.scores['hash'], Movie.scores['hash']))
filtering_group.add_argument('-a', '--age', help='download subtitles for videos newer than AGE e.g. 12h, 1w2d')
-@@ -75,7 +75,8 @@
+@@ -70,7 +70,8 @@
# parse paths
try:
@@ -70,7 +70,7 @@
import datetime
import hashlib
import logging
-@@ -348,13 +348,13 @@
+@@ -383,13 +383,13 @@
filehash = filesize
if filesize < 65536 * 2:
return None
@@ -86,7 +86,7 @@
filebuffer = f.read(bytesize)
(l_value,) = struct.unpack(b'q', filebuffer)
filehash += l_value
-@@ -378,4 +378,4 @@
+@@ -413,4 +413,4 @@
data = f.read(readsize)
f.seek(-readsize, os.SEEK_END)
data += f.read(readsize)
Modified: packages/subliminal/trunk/debian/patches/series
===================================================================
--- packages/subliminal/trunk/debian/patches/series 2015-05-10 15:45:59 UTC (rev 32646)
+++ packages/subliminal/trunk/debian/patches/series 2015-05-10 16:18:29 UTC (rev 32647)
@@ -1,5 +1,3 @@
charade.patch
bounds.patch
python3.patch
-babelfish.patch
-guessit.patch
More information about the Python-modules-commits
mailing list