We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 2
python-tvdb_api.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Fri Apr 21 12:40:16 UTC 2017 - aloisio@gmx.com4
+5
+- Update to version 1.106
+- Spec cleanup7
+8
+-------------------------------------------------------------------9
Mon Feb 4 14:26:00 UTC 2013 - hvogel@opensuse.org10
11
- Update to version 1.8.212
python-tvdb_api.spec
Changed
77
1
2
+#3
+# spec file for package python-tvdb_api4
+#5
+# Copyright (c) 2017 Packman Team <packman@links2linux.de>6
+#7
+# All modifications and additions to the file contributed by third parties8
+# remain the property of their copyright owners, unless otherwise agreed9
+# upon. The license for this file, and modifications and additions to the10
+# file, is the same license as for the pristine package itself (unless the11
+# license for the pristine package is not an Open Source License, in which12
+# case the license is the MIT License). An "Open Source License" is a13
+# license that conforms to the Open Source Definition (Version 1.9)14
+# published by the Open Source Initiative.15
+16
+# Please submit bugfixes or comments via http://bugs.links2linux.org/17
+#18
+19
+20
%define modname tvdb_api21
-Name: python-tvdb_api22
-Summary: Python module to access the API from thetvdb.com23
-License: GPL24
-Url: http://pypi.python.org/pypi/tvdb_api25
-Group: Productivity/Multimedia/Other26
-Version: 1.8.227
-Release: 128
-Source0: tvdb_api-%version.tar.bz229
-BuildRoot: %{_tmppath}/%{name}-buildroot30
-BuildRequires: python-devel python-setuptools31
+Name: python-tvdb_api32
+Version: 1.1033
+Release: 034
+Summary: Python module to access the API from thetvdb.com35
+# The UnLicense (https://unlicense.org)36
+License: SUSE-Permissive37
+Group: Productivity/Multimedia/Other38
+Url: https://github.com/dbr/tvdb_api/tree/master39
+Source0: https://files.pythonhosted.org/packages/source/t/%{modname}/%{modname}-%{version}.tar.gz40
+BuildRequires: python-devel41
+BuildRequires: python-setuptools42
+BuildRoot: %{_tmppath}/%{name}-%{version}-build43
+BuildArch: noarch44
%py_requires45
46
%description47
-tvdb_api is an easy to use interface to thetvdb.com48
+tvdb_api is an easy to use interface to thetvdb.com via python49
50
%prep51
-%setup -q -n %modname-%version52
+%setup -q -n %{modname}-%{version}53
+for file in {tvdb_cache,tvdb_api,tvdb_ui,tvdb_exceptions}54
+do55
+ sed -i "1d" $file.py56
+done57
58
%build59
+python setup.py build60
61
%install62
-python setup.py install --root=$RPM_BUILD_ROOT --prefix=%_prefix \63
- --record-rpm=INSTALLED_FILES64
-65
-%clean66
-rm -rf $RPM_BUILD_ROOT67
+python setup.py install --root=%{buildroot} --prefix=%{_prefix}68
69
-%files -f INSTALLED_FILES70
+%files71
%defattr(-,root,root)72
+%doc UNLICENSE readme.md73
+%{python_sitelib}/tvdb_*.py*74
+%{python_sitelib}/%{modname}-%{version}-py%{python_version}.egg-info75
76
%changelog77
tvdb_api-1.8.2.tar.bz2/PKG-INFO -> tvdb_api-1.10.tar.gz/PKG-INFO
Changed
22
1
2
-Metadata-Version: 1.03
+Metadata-Version: 1.14
Name: tvdb_api5
-Version: 1.8.26
+Version: 1.107
Summary: Interface to thetvdb.com8
Home-page: http://github.com/dbr/tvdb_api/tree/master9
Author: dbr/Ben10
11
Classifier: Natural Language :: English12
Classifier: Operating System :: OS Independent13
Classifier: Programming Language :: Python14
+Classifier: Programming Language :: Python :: 215
+Classifier: Programming Language :: Python :: 2.616
+Classifier: Programming Language :: Python :: 2.717
+Classifier: Programming Language :: Python :: 3.318
+Classifier: Programming Language :: Python :: 3.419
Classifier: Topic :: Multimedia20
Classifier: Topic :: Utilities21
Classifier: Topic :: Software Development :: Libraries :: Python Modules22
tvdb_api-1.8.2.tar.bz2/Rakefile -> tvdb_api-1.10.tar.gz/Rakefile
Changed
14
1
2
end3
4
desc "Upload current version to PyPi"5
-task :topypi => :test do6
+task :topypi do7
cur_file = File.open("tvdb_api.py").read()8
tvdb_api_version = cur_file.scan(/__version__ = "(.*)"/)9
- tvdb_api_version = tvdb_api_version[0][0].to_f10
+ tvdb_api_version = tvdb_api_version[0][0]11
12
puts "Build sdist and send tvdb_api v#{tvdb_api_version} to PyPi?"13
if $stdin.gets.chomp == "y"14
tvdb_api-1.8.2.tar.bz2/readme.md -> tvdb_api-1.10.tar.gz/readme.md
Changed
35
1
2
3
`tvdb_api` is an easy to use interface to [thetvdb.com][tvdb]4
5
+It supports Python 2.6, 2.7, 3.3 and 3.46
+7
`tvnamer` has moved to a separate repository: [github.com/dbr/tvnamer][tvnamer] - it is a utility which uses `tvdb_api` to rename files from `some.show.s01e03.blah.abc.avi` to `Some Show - [01x03] - The Episode Name.avi` (which works by getting the episode name from `tvdb_api`)8
9
[](http://travis-ci.org/dbr/tvdb_api)10
11
12
There are several exceptions you may catch, these can be imported from `tvdb_api`:13
14
-- `tvdb_error` - this is raised when there is an error communicating with [www.thetvdb.com][tvdb] (a network error most commonly)15
+- `tvdb_error` - this is raised when there is an error communicating with [thetvdb.com][tvdb] (a network error most commonly)16
- `tvdb_userabort` - raised when a user aborts the Select Series dialog (by `ctrl+c`, or entering `q`)17
- `tvdb_shownotfound` - raised when `t['show name']` cannot find anything18
- `tvdb_seasonnotfound` - raised when the requested series (`t['show name][99]`) does not exist19
20
The data is stored in an attribute named `data`, within the Show instance:21
22
>>> t['scrubs'].data.keys()23
- ['networkid', 'rating', 'airs_dayofweek', 'contentrating', 'seriesname', 'id', 'airs_time', 'network', 'fanart', 'lastupdated', 'actors', 'ratingcount', 'status', 'added', 'poster', 'imdb_id', 'genre', 'banner', 'seriesid', 'language', 'zap2it_id', 'addedby', 'firstaired', 'runtime', 'overview']24
+ ['networkid', 'rating', 'airs_dayofweek', 'contentrating', 'seriesname', 'id', 'airs_time', 'network', 'fanart', 'lastupdated', 'actors', 'ratingcount', 'status', 'added', 'poster', 'imdb_id', 'genre', 'banner', 'seriesid', 'language', 'zap2it_id', 'addedby', 'tms_wanted', 'firstaired', 'runtime', 'overview']25
26
Although each element is also accessible via `t['scrubs']` for ease-of-use:27
28
29
>>> t['scrubs']['actors']30
u'|Zach Braff|Donald Faison|Sarah Chalke|Christa Miller|Aloma Wright|Robert Maschio|Sam Lloyd|Neil Flynn|Ken Jenkins|Judy Reyes|John C. McGinley|Travis Schuldt|Johnny Kastl|Heather Graham|Michael Mosley|Kerry Bish\xe9|Dave Franco|Eliza Coupe|'31
32
-[tvdb]: http://www.thetvdb.com33
+[tvdb]: http://thetvdb.com34
[tvnamer]: http://github.com/dbr/tvnamer35
tvdb_api-1.8.2.tar.bz2/setup.py -> tvdb_api-1.10.tar.gz/setup.py
Changed
49
1
2
+import sys3
from setuptools import setup4
+5
+IS_PY2 = sys.version_info[0] == 26
+7
+_requirements = []8
+if not IS_PY2:9
+ _requirements.append('requests_cache')10
+11
+ # 'requests' is installed as requirement by requests-cache,12
+ # commented out because it triggers a bug in setuptool:13
+ # https://bitbucket.org/pypa/setuptools/issue/196/tests_require-pytest-pytest-cov-breaks14
+15
+16
+_modules = ['tvdb_api', 'tvdb_ui', 'tvdb_exceptions']17
+if IS_PY2:18
+ _modules.append('tvdb_cache')19
+20
+21
setup(22
name = 'tvdb_api',23
-version='1.8.2',24
+version='1.10',25
26
author='dbr/Ben',27
description='Interface to thetvdb.com',28
29
u'Stole a Badge'30
""",31
32
-py_modules = ['tvdb_api', 'tvdb_ui', 'tvdb_exceptions', 'tvdb_cache'],33
+py_modules = _modules,34
+install_requires = _requirements,35
36
classifiers=[37
"Intended Audience :: Developers",38
"Natural Language :: English",39
"Operating System :: OS Independent",40
"Programming Language :: Python",41
+ "Programming Language :: Python :: 2",42
+ "Programming Language :: Python :: 2.6",43
+ "Programming Language :: Python :: 2.7",44
+ "Programming Language :: Python :: 3.3",45
+ "Programming Language :: Python :: 3.4",46
"Topic :: Multimedia",47
"Topic :: Utilities",48
"Topic :: Software Development :: Libraries :: Python Modules",49
tvdb_api-1.8.2.tar.bz2/tests/test_tvdb_api.py -> tvdb_api-1.10.tar.gz/tests/test_tvdb_api.py
Changed
137
1
2
from tvdb_api import (tvdb_shownotfound, tvdb_seasonnotfound,3
tvdb_episodenotfound, tvdb_attributenotfound)4
5
+6
+IS_PY2 = sys.version_info[0] == 27
+8
+9
class test_tvdb_basic(unittest.TestCase):10
# Used to store the cached instance of Tvdb()11
t = None12
13
show14
)15
16
+ def test_no_season(self):17
+ show = self.t['Katekyo Hitman Reborn']18
+ print(tvdb_api)19
+ print(show[1][1])20
21
class test_tvdb_errors(unittest.TestCase):22
# Used to store the cached instance of Tvdb()23
24
"""Check valid_languages is up-to-date (compared to languages.xml)25
"""26
et = self.t._getetsrc(27
- "http://www.thetvdb.com/api/%s/languages.xml" % (28
+ "http://thetvdb.com/api/%s/languages.xml" % (29
self.t.config['apikey']30
)31
)32
33
self.fail("Expected ValueError from setting cache to float")34
35
def test_custom_urlopener(self):36
+ if not IS_PY2:37
+ raise unittest.SkipTest("cannot supply custom opener in Python 3 because requests is used")38
+39
class UsedCustomOpener(Exception):40
pass41
42
import urllib243
class TestOpener(urllib2.BaseHandler):44
def default_open(self, request):45
- print request.get_method()46
+ print(request.get_method())47
raise UsedCustomOpener("Something")48
49
custom_opener = urllib2.build_opener(TestOpener())50
51
else:52
self.fail("Did not use custom opener")53
54
+ def test_custom_request_session(self):55
+ if IS_PY2:56
+ return57
+ from requests import Session as OriginalSession58
+ class Used(Exception):59
+ pass60
+ class CustomCacheForTest(OriginalSession):61
+ call_count = 062
+ def request(self, *args, **kwargs):63
+ raise Used("Hurray")64
+ c = CustomCacheForTest()65
+ t = tvdb_api.Tvdb(cache = c)66
+ try:67
+ t['scrubs']68
+ except Used:69
+ pass70
+ else:71
+ self.fail("Did not use custom session")72
+73
+74
class test_tvdb_by_id(unittest.TestCase):75
t = None76
def setUp(self):77
78
self.assertEquals(self.t['My Name Is Earl'][1][4]['episodename'], 'Faked His Own Death')79
80
81
+class test_tvdb_show_ordering(unittest.TestCase):82
+ # Used to store the cached instance of Tvdb()83
+ t_dvd = None84
+ t_air = None85
+86
+ def setUp(self):87
+ if self.t_dvd is None:88
+ self.t_dvd = tvdb_api.Tvdb(cache = True, useZip = True, dvdorder=True)89
+90
+ if self.t_air is None:91
+ self.t_air = tvdb_api.Tvdb(cache = True, useZip = True)92
+93
+ def test_ordering(self):94
+ """Test Tvdb.search method95
+ """96
+ self.assertEquals(u'The Train Job', self.t_air['Firefly'][1][1]['episodename'])97
+ self.assertEquals(u'Serenity', self.t_dvd['Firefly'][1][1]['episodename'])98
+99
+ self.assertEquals(u'The Cat & the Claw (Part 1)', self.t_air['Batman The Animated Series'][1][1]['episodename'])100
+ self.assertEquals(u'On Leather Wings', self.t_dvd['Batman The Animated Series'][1][1]['episodename'])101
+102
+class test_tvdb_show_search(unittest.TestCase):103
+ # Used to store the cached instance of Tvdb()104
+ t = None105
+106
+ def setUp(self):107
+ if self.t is None:108
+ self.__class__.t = tvdb_api.Tvdb(cache = True, useZip = True)109
+110
+ def test_search(self):111
+ """Test Tvdb.search method112
+ """113
+ results = self.t.search("my name is earl")114
+ all_ids = [x['seriesid'] for x in results]115
+ self.assertTrue('75397' in all_ids)116
+117
+118
+class test_tvdb_alt_names(unittest.TestCase):119
+ t = None120
+ def setUp(self):121
+ if self.t is None:122
+ self.__class__.t = tvdb_api.Tvdb(cache = True, actors = True)123
+124
+ def test_1(self):125
+ """Tests basic access of series name alias126
+ """127
+ results = self.t.search("Don't Trust the B---- in Apartment 23")128
+ series = results[0]129
+ self.assertTrue(130
+ 'Apartment 23' in series['aliasnames']131
+ )132
+133
+134
if __name__ == '__main__':135
runner = unittest.TextTestRunner(verbosity = 2)136
unittest.main(testRunner = runner)137
tvdb_api-1.8.2.tar.bz2/tvdb_api.egg-info/PKG-INFO -> tvdb_api-1.10.tar.gz/tvdb_api.egg-info/PKG-INFO
Changed
22
1
2
-Metadata-Version: 1.03
+Metadata-Version: 1.14
Name: tvdb-api5
-Version: 1.8.26
+Version: 1.107
Summary: Interface to thetvdb.com8
Home-page: http://github.com/dbr/tvdb_api/tree/master9
Author: dbr/Ben10
11
Classifier: Natural Language :: English12
Classifier: Operating System :: OS Independent13
Classifier: Programming Language :: Python14
+Classifier: Programming Language :: Python :: 215
+Classifier: Programming Language :: Python :: 2.616
+Classifier: Programming Language :: Python :: 2.717
+Classifier: Programming Language :: Python :: 3.318
+Classifier: Programming Language :: Python :: 3.419
Classifier: Topic :: Multimedia20
Classifier: Topic :: Utilities21
Classifier: Topic :: Software Development :: Libraries :: Python Modules22
tvdb_api-1.8.2.tar.bz2/tvdb_api.py -> tvdb_api-1.10.tar.gz/tvdb_api.py
Changed
201
1
2
#repository:http://github.com/dbr/tvdb_api3
#license:unlicense (http://unlicense.org/)4
5
-"""Simple-to-use Python interface to The TVDB's API (www.thetvdb.com)6
+"""Simple-to-use Python interface to The TVDB's API (thetvdb.com)7
8
Example usage:9
10
11
u'Cabin Fever'12
"""13
__author__ = "dbr/Ben"14
-__version__ = "1.8.2"15
+__version__ = "1.10"16
+17
+import sys18
+19
+IS_PY2 = sys.version_info[0] == 220
21
import os22
import time23
-import urllib24
-import urllib225
+if IS_PY2:26
+ import urllib27
+ import urllib228
+ from tvdb_cache import CacheHandler29
+ from urllib import quote as url_quote30
+else:31
+ import requests32
+ from urllib.parse import quote as url_quote33
import getpass34
-import StringIO35
import tempfile36
import warnings37
import logging38
39
gzip = None40
41
42
-from tvdb_cache import CacheHandler43
+if IS_PY2:44
+ int_types = (int, long)45
+ text_type = unicode46
+else:47
+ int_types = int48
+ text_type = str49
+50
51
from tvdb_ui import BaseUI, ConsoleUI52
from tvdb_exceptions import (tvdb_error, tvdb_userabort, tvdb_shownotfound,53
54
55
#keep only the 100th latest results56
if time.time() - self._lastgc > 20:57
- tbd = self._stack[:-100]58
- i = 059
- for o in tbd:60
+ for o in self._stack[:-100]:61
del self[o]62
- del self._stack[i]63
- i += 164
+ self._stack = self._stack[-100:]65
+66
+ self._lastgc = time.time()67
68
- _lastgc = time.time()69
- del tbd70
- 71
super(ShowContainer, self).__setitem__(key, value)72
73
74
75
searchresult = cur_season.search(term = term, key = key)76
if len(searchresult) != 0:77
results.extend(searchresult)78
- #end for cur_season79
+80
return results81
82
83
84
if term == None:85
raise TypeError("must supply string to search for (contents)")86
87
- term = unicode(term).lower()88
+ term = text_type(term).lower()89
for cur_key, cur_value in self.items():90
- cur_key, cur_value = unicode(cur_key).lower(), unicode(cur_value).lower()91
+ cur_key, cur_value = text_type(cur_key).lower(), text_type(cur_value).lower()92
if key is not None and cur_key != key:93
# Do not search this key94
continue95
- if cur_value.find( unicode(term).lower() ) > -1:96
+ if cur_value.find( text_type(term).lower() ) > -1:97
return self98
- #end if cur_value.find()99
- #end for cur_key, cur_value100
101
102
class Actors(list):103
104
search_all_languages = False,105
apikey = None,106
forceConnect=False,107
- useZip=False):108
+ useZip=False,109
+ dvdorder=False):110
111
"""interactive (True/False):112
When True, uses built-in console UI is used to select the correct show.113
114
an arbitrary Python object, which is used as a urllib2115
opener, which should be created by urllib2.build_opener116
117
+ In Python 3, True/False enable or disable default118
+ caching. Passing string specified directory where to store119
+ the "tvdb.sqlite3" cache file. Also a custom120
+ requests.Session instance can be passed (e.g maybe a121
+ customised instance of requests_cache.CachedSession)122
+123
banners (True/False):124
Retrieves the banners for a show. These are accessed125
via the _banners key of a Show(), for example:126
127
And only the main language xml is used, the actor and banner xml are lost.128
"""129
130
+131
global lastTimeout132
133
# if we're given a lastTimeout that is less than 1 min just give up134
135
136
self.config['useZip'] = useZip137
138
+ self.config['dvdorder'] = dvdorder139
140
- if cache is True:141
- self.config['cache_enabled'] = True142
- self.config['cache_location'] = self._getTempDir()143
- self.urlopener = urllib2.build_opener(144
- CacheHandler(self.config['cache_location'])145
- )146
+ if not IS_PY2: # FIXME: Allow using requests in Python 2?147
+ import requests_cache148
+ if cache is True:149
+ self.session = requests_cache.CachedSession(150
+ expire_after=21600, # 6 hours151
+ backend='sqlite',152
+ cache_name=self._getTempDir(),153
+ )154
+ self.config['cache_enabled'] = True155
+ elif cache is False:156
+ self.session = requests.Session()157
+ self.config['cache_enabled'] = False158
+ elif isinstance(cache, text_type):159
+ # Specified cache path160
+ self.session = requests_cache.CachedSession(161
+ expire_after=21600, # 6 hours162
+ backend='sqlite',163
+ cache_name=os.path.join(cache, "tvdb_api"),164
+ )165
+ else:166
+ self.session = cache167
+ try:168
+ self.session.get169
+ except AttributeError:170
+ raise ValueError("cache argument must be True/False, string as cache path or requests.Session-type object (e.g from requests_cache.CachedSession)")171
+ else:172
+ # For backwards compatibility in Python 2.x173
+ if cache is True:174
+ self.config['cache_enabled'] = True175
+ self.config['cache_location'] = self._getTempDir()176
+ self.urlopener = urllib2.build_opener(177
+ CacheHandler(self.config['cache_location'])178
+ )179
180
- elif cache is False:181
- self.config['cache_enabled'] = False182
- self.urlopener = urllib2.build_opener() # default opener with no caching183
+ elif cache is False:184
+ self.config['cache_enabled'] = False185
+ self.urlopener = urllib2.build_opener() # default opener with no caching186
187
- elif isinstance(cache, basestring):188
- self.config['cache_enabled'] = True189
- self.config['cache_location'] = cache190
- self.urlopener = urllib2.build_opener(191
- CacheHandler(self.config['cache_location'])192
- )193
+ elif isinstance(cache, basestring):194
+ self.config['cache_enabled'] = True195
+ self.config['cache_location'] = cache196
+ self.urlopener = urllib2.build_opener(197
+ CacheHandler(self.config['cache_location'])198
+ )199
200
- elif isinstance(cache, urllib2.OpenerDirector):201
tvdb_api-1.8.2.tar.bz2/tvdb_cache.py -> tvdb_api-1.10.tar.gz/tvdb_cache.py
Changed
18
1
2
from __future__ import with_statement3
4
__author__ = "dbr/Ben"5
-__version__ = "1.8.2"6
+__version__ = "1.10"7
8
import os9
import time10
11
)12
else:13
set_cache_header = True14
- #end if x-cache in response15
16
return CachedResponse(17
self.cache_location,18
tvdb_api-1.8.2.tar.bz2/tvdb_exceptions.py -> tvdb_api-1.10.tar.gz/tvdb_exceptions.py
Changed
40
1
2
"""3
4
__author__ = "dbr/Ben"5
-__version__ = "1.8.2"6
+__version__ = "1.10"7
8
__all__ = ["tvdb_error", "tvdb_userabort", "tvdb_shownotfound",9
"tvdb_seasonnotfound", "tvdb_episodenotfound", "tvdb_attributenotfound"]10
11
pass12
13
class tvdb_error(tvdb_exception):14
- """An error with www.thetvdb.com (Cannot connect, for example)15
+ """An error with thetvdb.com (Cannot connect, for example)16
"""17
pass18
19
20
pass21
22
class tvdb_shownotfound(tvdb_exception):23
- """Show cannot be found on www.thetvdb.com (non-existant show)24
+ """Show cannot be found on thetvdb.com (non-existant show)25
"""26
pass27
28
class tvdb_seasonnotfound(tvdb_exception):29
- """Season cannot be found on www.thetvdb.com30
+ """Season cannot be found on thetvdb.com31
"""32
pass33
34
class tvdb_episodenotfound(tvdb_exception):35
- """Episode cannot be found on www.thetvdb.com36
+ """Episode cannot be found on thetvdb.com37
"""38
pass39
40
tvdb_api-1.8.2.tar.bz2/tvdb_ui.py -> tvdb_api-1.10.tar.gz/tvdb_ui.py
Changed
109
1
2
"""3
4
__author__ = "dbr/Ben"5
-__version__ = "1.8.2"6
+__version__ = "1.10"7
8
+import sys9
import logging10
import warnings11
12
from tvdb_exceptions import tvdb_userabort13
14
+15
+IS_PY2 = sys.version_info[0] == 216
+17
+if IS_PY2:18
+ user_input = raw_input19
+else:20
+ user_input = input21
+22
+23
def log():24
return logging.getLogger(__name__)25
26
27
else:28
toshow = allSeries29
30
- print "TVDB Search Results:"31
+ print("TVDB Search Results:")32
for i, cshow in enumerate(toshow):33
i_show = i + 1 # Start at more human readable number 1 (not 0)34
log().debug('Showing allSeries[%s], series %s)' % (i_show, allSeries[i]['seriesname']))35
36
else:37
extra = ""38
39
- print "%s -> %s [%s] # http://thetvdb.com/?tab=series&id=%s&lid=%s%s" % (40
+ output = "%s -> %s [%s] # http://thetvdb.com/?tab=series&id=%s&lid=%s%s" % (41
i_show,42
- cshow['seriesname'].encode("UTF-8", "ignore"),43
- cshow['language'].encode("UTF-8", "ignore"),44
+ cshow['seriesname'],45
+ cshow['language'],46
str(cshow['id']),47
cshow['lid'],48
extra49
)50
+ if IS_PY2:51
+ print(output.encode("UTF-8", "ignore"))52
+ else:53
+ print(output)54
55
def selectSeries(self, allSeries):56
self._displaySeries(allSeries)57
58
if len(allSeries) == 1:59
# Single result, return it!60
- print "Automatically selecting only result"61
+ print("Automatically selecting only result")62
return allSeries[0]63
64
if self.config['select_first'] is True:65
- print "Automatically returning first search result"66
+ print("Automatically returning first search result")67
return allSeries[0]68
69
while True: # return breaks this loop70
try:71
- print "Enter choice (first number, return for default, 'all', ? for help):"72
- ans = raw_input()73
+ print("Enter choice (first number, return for default, 'all', ? for help):")74
+ ans = user_input()75
except KeyboardInterrupt:76
raise tvdb_userabort("User aborted (^c keyboard interupt)")77
except EOFError:78
79
log().debug('Got quit command (q)')80
raise tvdb_userabort("User aborted ('q' quit command)")81
elif ans == "?":82
- print "## Help"83
- print "# Enter the number that corresponds to the correct show."84
- print "# a - display all results"85
- print "# all - display all results"86
- print "# ? - this help"87
- print "# q - abort tvnamer"88
- print "# Press return with no input to select first result"89
+ print("## Help")90
+ print("# Enter the number that corresponds to the correct show.")91
+ print("# a - display all results")92
+ print("# all - display all results")93
+ print("# ? - this help")94
+ print("# q - abort tvnamer")95
+ print("# Press return with no input to select first result")96
elif ans.lower() in ["a", "all"]:97
self._displaySeries(allSeries, limit = None)98
else:99
100
return allSeries[selected_id]101
except IndexError:102
log().debug('Invalid show number entered!')103
- print "Invalid number (%s) selected!"104
+ print("Invalid number (%s) selected!")105
self._displaySeries(allSeries)106
- #end try107
- #end while not valid_input108
109