Modernisation (python 3 only, new requests-cache version)

.flake8

@@ -1,7 +1,8 @@
 [flake8]
 max-line-length = 100
 ignore =
-    N802, # FIXME: tidy up camel case naming mess then re-enable these
-    N803,
-
     W503, # Contradicts PEP8
+
+    E402, # breaks sys.path addition etc
+
+    N818, # Wants 'Error' suffix on exception names

.github/workflows/test.yml

@@ -0,0 +1,39 @@
+name: CI
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+
+    strategy:
+      matrix:
+        python-version:
+          - '3.7'
+          - '3.8'
+          - '3.9'
+          - '3.10'
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+
+    name: Test python ${{ matrix.python-version }} (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dev deps
+      run: |
+        pip install codecov
+        pip install -r requirements-dev.txt
+        python setup.py develop
+    - name: Run tests
+      run: python -m pytest
+    - name: Upload test results
+      run: codecov

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## Unreleased
+
+- Dropped support for Python 2. Only maintained versions of Python are supported (currently Python 3.7 onwards)
+- Support newer requests-cache version (0.6 onwards)
+  [PR #97](https://github.com/dbr/tvdb_api/pull/97)
+- Removed deprecated `tvdb_*` exceptions (e.g `tvdb_error` is now `TvdbError`)
+- Remove deprecated `Tvdb(forceConnect=...)` option
+- Remove 'search_all_languages' option - had no effect
+- Remove `self.log` from custom UI's (which inherit from `BaseUI` etc)
+
 ## `3.1` - 2021-04-29
 
 - Rename exceptions to conventional PEP8 naming syntax, e.g `tvdb_error` becomes `TvdbError`, `tvdb_episodenotfound` becomes `TvdbEpisodeNotFound` etc. All exceptions have changed. Backwards-compatible bindings to old names exist until next version (i.e will be removed in version 3.2)

README.md

@@ -86,7 +86,7 @@ All data exposed by [thetvdb.com][tvdb] is accessible via the `Show` class. A Sh
 For example, to find out what network Scrubs is aired:
 
     >>> t['scrubs']['network']
-    u'ABC'
+    'ABC'
 
 The data is stored in an attribute named `data`, within the Show instance:
 
@@ -96,7 +96,7 @@ The data is stored in an attribute named `data`, within the Show instance:
 Although each element is also accessible via `t['scrubs']` for ease-of-use:
 
     >>> t['scrubs']['rating']
-    u'9.0'
+    '9.0'
 
 This is the recommended way of retrieving "one-off" data (for example, if you are only interested in "seriesname"). If you wish to iterate over all data, or check if a particular show has a specific piece of data, use the `data` attribute,
 
@@ -126,9 +126,9 @@ Extended actor data is accessible similarly:
     >>> actors[0].keys()
     ['sortorder', 'image', 'role', 'id', 'name']
     >>> actors[0]['role']
-    u'Dr. John Michael "J.D." Dorian'
+    'Dr. John Michael "J.D." Dorian'
 
 Remember a simple list of actors is accessible via the default Show data:
 
     >>> t['scrubs']['actors']
-    u'|Zach Braff|Donald Faison|Sarah Chalke|Judy Reyes|John C. McGinley|Neil Flynn|Ken Jenkins|Christa Miller|Aloma Wright|Robert Maschio|Sam Lloyd|Travis Schuldt|Johnny Kastl|Heather Graham|Michael Mosley|Kerry Bish\xe9|Dave Franco|Eliza Coupe|'
+    '|Zach Braff|Donald Faison|Sarah Chalke|Judy Reyes|John C. McGinley|Neil Flynn|Ken Jenkins|Christa Miller|Aloma Wright|Robert Maschio|Sam Lloyd|Travis Schuldt|Johnny Kastl|Heather Graham|Michael Mosley|Kerry Bish\xe9|Dave Franco|Eliza Coupe|'

requirements-dev.txt

@@ -1,7 +1,6 @@
-pytest==5.4; python_version > '3.0'
-pytest==4.6; python_version == '2.7'
+pytest==7.1
 coverage
-pytest-cov==2.8
+pytest-cov==4.0
 pytest-env==0.6
-flake8==3.8
-pep8-naming==0.10
+flake8==5.0
+pep8-naming==0.13

setup.py

@@ -23,19 +23,17 @@
     long_description_content_type='text/markdown',
 
     py_modules=['tvdb_api'],
-    install_requires=['requests_cache', 'requests'],
+    install_requires=['requests_cache~=0.9.6', 'requests~=2.28.1'],
 
     classifiers=[
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Topic :: Multimedia",
         "Topic :: Utilities",
         "Topic :: Software Development :: Libraries :: Python Modules",

tests/http_cache/00f21346b414cebe.json

@@ -0,0 +1,43 @@
+{
+  "_content": "dm?0EbYUVoTYDm5Y-wS0Wpg4rTU{(7VqtD>WpW}qA}?ZLZf<3Ab1!FdVQ^?^V_|GBI59UlGA(B=YH(*FEFxxUa&vS+X>w&`B03^6FfcMLFgYzTIU+0~X=EZgH!(FeIV>V+ZDD6+B03^3VqtD>WpZ;baBp*TWpZ;bH!(FeIV~|RYH(*FEFx}Yba!uZYa%)#K|(_@A}k_rc4cyQX=QgJIwD4LZ*3q$Xkl|@azk%&a5^AEPEJlvAZc?TVIXd0cXJ?NZe$>1b#iiLZge1FW@ce&a&sVKXkl({Wo#gCcWz~5AYpD~Aa8JGa$$63WFTUBAVX+jb7gWvZ*p)hAW3u}cVTlNW^Z+FWMyO^VtF7#Xkl|@azk%&a3DiPPas5Lc4=fFQ*>o_VRCdJX>K4fIXE*QbZ;PIZ*^{TWpZI-bRcYLVr6n+Y#?H3VRIm9ZXk4MWgu;3WNBd_VQyp~a%F8{X>M~MbZBKDV{dY9WpZ<LZ*FBEZ)PB2AarGHWp-(EX>V>IZe?_LZ*prObZB98AZ~AWAY*TCbYW?3b0BYaWpW@iFd$@UW@cq_Wo~pJV`yP+Ze?t9EFg1mVQzCEGC4FLV{dhCbaH8Bb0A@EWFT^7VPj}zb0A?LaBp;FZggp3Y#?KGZFOv6bZK^FAYpZ6X=QF>Wgu^6ATcm7AYy53Y-w+9AaG@GaBO8DaAk5JcV%U3A}k_sZ*z2Iaw0k+FJfVCZe?<FFK};jbY*gLFE=qYH90LYE^2URA}k_vWpZg{b53DxWg<EvLug@hWpW@+Z*DD9bZ>AVPGxs<AWmg;cW-iQASgplPEJlKA}k_vY;|WMIwE6eVRL12EpBgaEpv2la4l|ScXKUnWpsCMa%(MPZf<UFA}k_vbYXOLb0Rt-MQ&teWFmcCeE",
+  "created_at": "2022-10-04T02:22:35.250016",
+  "elapsed": 0.40231,
+  "encoding": "utf-8",
+  "headers": {
+    "Content-Type": "application/json; charset=utf-8",
+    "Content-Length": "709",
+    "Connection": "keep-alive",
+    "Date": "Tue, 04 Oct 2022 02:22:35 GMT",
+    "Cache-Control": "private, max-age=86400",
+    "X-Powered-By": "Thundar!",
+    "X-Thetvdb-Api-Version": "3.0.0",
+    "Vary": "Accept-Language",
+    "X-Cache": "Miss from cloudfront",
+    "Via": "1.1 1b8d25a254f659ff0989f0e7bb579086.cloudfront.net (CloudFront)",
+    "X-Amz-Cf-Pop": "MEL50-C2",
+    "X-Amz-Cf-Id": "M7y_DeqdTkcRxT8IeLthytrUG2I5xII9MeotShJNKEY56AfsL8MWSQ=="
+  },
+  "raw": {
+    "decode_content": false,
+    "reason": "OK",
+    "status": 200,
+    "version": 11
+  },
+  "reason": "OK",
+  "request": {
+    "body": "PH%2y",
+    "headers": {
+      "User-Agent": "python-requests/2.28.1",
+      "Accept-Encoding": "gzip, deflate",
+      "Accept": "application/json",
+      "Connection": "keep-alive",
+      "Content-Type": "application/json",
+      "Accept-Language": "en",
+      "Authorization": "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NjU0NTQ5NTQsImlkIjoidHZkYl9hcGkgdGVzdHMiLCJvcmlnX2lhdCI6MTY2NDg1MDE1NH0.ls-14hTZc1EVVv-7XfB-39aluSnoHIZ6uOCU7WzMz5l1rQTKKdcbY0j5qwXty2dHrw1KB5rhrHGLkqwVPoo1qA1y5-TkyPJL9LksyhmtOKQg4QuWssq2asVL0W2RRgUl8g4NlH10Ta-y6J2X31Ws6q4rt5BxBqRQLC0xcaD80ROg7K6a-dG2fne42MnCnW8kPXRqk22fluPEaN3o0Rb1bBSPEu2hkeFx-cLEaDtFBDUPC5zadPyFQpt_FI7UULaEmsCdZKdy2cf5AIuKUjQt3_O0anrQ_3Ml_A034IpyrwtFjMkTVnyrJVLu0GUnGvE50qbbhWL4qyjkRiwkM3zjvg"
+    },
+    "method": "GET",
+    "url": "https://api.thetvdb.com/search/series?name=CNNNN"
+  },
+  "status_code": 200,
+  "url": "https://api.thetvdb.com/search/series?name=CNNNN"
+}

tests/http_cache/0327519432fc37c7.json

@@ -0,0 +1,44 @@
+{
+  "_content": "dm?0EbYUVoTYDm5Y-wS0Wpg4rTOw0qa&=;JAT1z7X=NZmZf3)zZf9k3A}k{5hO6nBqUVc(=7Y25o3bKZEFxlIZf<3AB03^3VqtD>WpZ;bXL4b1XlY|%Y%e!9F*P<VXE8A@YH(*FEFxxUa&vS+X>w&`B03^6FfcJKF)%GKG9oM@X=EZgH#RXfHY_4(ZDD6+B03^3VqtD>WpZ;baBp*TWpZ;bH#RXfHZ3+TYH(*FEFx}Yba!uZYa%)#PC`Q>EFy1qWpZ|DWp^SvB1$eqE+A!dbRczZAZlfGZe<{C!>MFtV`*+6adl}RWW%Xqb#!GQb73H3VRCY5!>Dp)AY@@~b0BOdXv4H{X>?(1AY^qQQ(<Fr!>KJpZ)J6IE+9#4Aa-eVAYpc8V<2;HZXj)CX>4p|b#fqKZD}A>b#iMgAaQkRAZ&GMAZ2rOAY*80a&>ZNX=QF8WMOV|AZ%qIZNsW<Wguw7v~X#3VQelSRC2?pb0BtUbY(0cRCRJ|AarkSVr3v<ZEtmQWp#KUWG8iQWguy8W@&P5X~U>;WgtUga%^EPAVq9!X>W8OWo~qGWgui>ZgU`PVIX2*Ze(RHAVVi*b95keZe<|DsdRN@X<=@3Wgum4AZ^2`WMyM%Ze<{Gb!BXEb!8xMWpyBPb#icWWo}_^bY(6eOl2T*WpZ|DV`U&@Wgu<CsbpniX>Mg8Wpi{OWNC6~XTzx=aA9&FY$s)SV`Xl1a%pjOWgtXvV{~P8av(!*cpzbHZ*p@Wadl-NY$s^Lv~X#3VQe5}b95kQ!>Mw^sUUD+av*GFAY^G_VsC6|adl-NL~mnsWp#2OOJ!_xZ!RD~AY)~0VIX#CWo~X|Zge1XCt+%Db#!HNAaHDDX>K57Wgu{6a&vEPZeeF-b0BDMa&sVLbs%GJZEbaKAUYsaZ)9X3Y-J#0XlZhFa%X8}ZXj=BbHk}*!>KGFRApo!Y$suMZ)0I}AY{X-aB^jHb7^KQAZ%qIV{dL_X=QR}Wgu~NX&`iRZ*_KMAarkaYHxLNb0BqYAZ>4XWo{s3CuMD7!>V*;av(}XE-o%0Rc>V<Vr6V>Wgur^Y-Mt3Wgui_AaG@Jb8l{LVP|C^AtEdyaBp*TWpW}qA}?ZLZf<3Ab1!gjb97~Lb1yeGF*P<VHZE##XCf>jb7gXAWphqpZDk@lB2!~>bz*ZOEFyDkb!Q?vB6DMMbz*ZOEFyDsVRUtKB03^PZe(R-B7H1-B4KQ4VRL13B05`LEFxlIZf<3AB03^3VqtD>WpZ;bXL4b1XlY|%Y%ei3H!(FaEoUxjaAzVcB4%lFb96yza%E&9IwCSKF)%GKH7zkPA}k_lWFk5-Ha9UfF)Si!ZDD6+B03^3VqtD>WpZ;bX>DO=WpgiWX>)UFZf7rZWpZg{b1rIdXCf>jZe?_LZ*prQIwDC_Rw67SaBp*TWpW}qA}?ZLZf<3Ab1!LaVP|D?FKuaab7^j8FLPybX=QURYH(*FEFyDda%p9APGN0jB03^hZ*pySZ*OEEQ)6;<Vsj!aB6DnYXCgWxcW-iScW-ZGEpuaXbz*ZOEFyDsVRUtKB03^PZe(R-B7H1-B4KQ4VRL13B05`LEFxlIZf<3AB03@>EFxxUa&vS+X>w&`B03^6FflVNF)%GMH6kn`X=EZgGB-3gGc_zCX>DO=Wg<EvFJfVCZe?<FFK};jbY*gLFETeYH#0RYF)nIwXCf>jZe?_LZ*prQIwDO}Rw67SaBp*TWpW}qA}?ZLZf<3Ab1!gjb97~Lb1yPCG&eIfEio=?aAzVcB6DSOX=QUxVQpn1IwDhJa&=;2X>MmANp2!6B6DnYXCgWxb7OLKVq$4-XDw-NA}k_vbYXOLb0Rt-MQ&teWFmcCeE",
+  "created_at": "2022-10-04T02:22:38.320591",
+  "elapsed": 0.401706,
+  "encoding": "utf-8",
+  "headers": {
+    "Content-Type": "application/json; charset=utf-8",
+    "Transfer-Encoding": "chunked",
+    "Connection": "keep-alive",
+    "Date": "Tue, 04 Oct 2022 02:22:38 GMT",
+    "Cache-Control": "private, max-age=86400",
+    "X-Powered-By": "Thundar!",
+    "X-Thetvdb-Api-Version": "3.0.0",
+    "Content-Encoding": "gzip",
+    "Vary": "Accept-Encoding,Accept-Language",
+    "X-Cache": "Miss from cloudfront",
+    "Via": "1.1 fe252828480d3aff57bbecb4f3bec932.cloudfront.net (CloudFront)",
+    "X-Amz-Cf-Pop": "MEL50-C2",
+    "X-Amz-Cf-Id": "-HGUptA3YlNCw8KVNpF8HzK9rlX8IvQTDWMo5pTulzZNEUJX2z0Y0w=="
+  },
+  "raw": {
+    "decode_content": false,
+    "reason": "OK",
+    "status": 200,
+    "version": 11
+  },
+  "reason": "OK",
+  "request": {
+    "body": "PH%2y",
+    "headers": {
+      "User-Agent": "python-requests/2.28.1",
+      "Accept-Encoding": "gzip, deflate",
+      "Accept": "application/json",
+      "Connection": "keep-alive",
+      "Content-Type": "application/json",
+      "Accept-Language": "fr",
+      "Authorization": "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NjU0NTQ5NTcsImlkIjoidHZkYl9hcGkgdGVzdHMiLCJvcmlnX2lhdCI6MTY2NDg1MDE1N30.GwvJ9--cqyPZAq6AYkqfgdbQ8HeSwaLuPk8cWwNNdPt1ZiXJieVqe48PozAn98acM_WieefWbQGJBioD3HeNGu_3kIRTmJ6RwmcIyt-jR6v-bMX1ZPH28tO_G7cqonUqZTTHc3NKM8zjhFlQ_7hmemiUIDvt5dkxOsH6HJn4VQE6CWdjrwmYdEgRpUeAidVRj_3NiEz8FTa5iEYi4FQcNiVpq5dd24cwQ0RU2lDVThIQBxaClj5o_PO01aHEXogc2tVIxMBUy83VAKC4ejqBnMMAn8J7Yz1GDLfHJoelFxq-nv9H1-2hSWfjQsDVQ9uqL9bZSml44w4uzP59n9X6yA"
+    },
+    "method": "GET",
+    "url": "https://api.thetvdb.com/search/series?name=scrubs"
+  },
+  "status_code": 200,
+  "url": "https://api.thetvdb.com/search/series?name=scrubs"
+}

tests/http_cache/04ae7be0a6db6047.json

@@ -0,0 +1,43 @@
+{
+  "_content": "dm?0EbYUVoTYDm5Y-wS0Wpg4rTOvVlVRCeBWo~pJGBYA9B1CU)Cv+fGa&>cbAarPDAVMH%ZXiK$bRaS_A}k_AZ*C`aAXIX7b95kdXk{QmX>?;~AZczOL2zMmbZupBbRaS_B3&#ZVqtD>WpW}qA}?ZLZf<3Ab1!FdVQ^?^V_|GBGBh|iF)}S@G%jjzXCf>jW@&PBbU|ryWn>~cA~G;BGA%GPEio}7EFx)SB04fOI5;sfEFx)bVP|C`IwCJ(VQy|^a&s?mZ*z2Ia&s>-G&ndhGA%PMYH(*FEFx}Yba!uZYa%)#K|(_yC{<G_A}k_rc4cyQX=QgJIwC`8Y;R>CX>%Z9AWmg>AX#s6Yano8a&&nhXK8Y5Aa`kWXdrZGWgu;Da$#(9Aa7<MVIXj6a$$63E+A8AWguf=b#rBNAartXbz*E~AZBlJAZTTBAZ}r4c4Z)QZDDL|AarkcZXj}RZ*6U1bY(0cN_B2!EFfWSWFSLmY;R>Jb0A`6b95kPa%p95WGo;`VQpn|AXZ^+AVg(yAVOtjYc3)zB5-eWbY*fPIwCJ(VQy|^a&s?mZ*z2Ia&s>-G&ndhGA%PMYH(*FEFyDda%p9APGN0jB03^OZ*C`aAXIX7b95kdXk{QmEiElAAZczOL2zMmbZupBbRaS_A}k_vY;|WMIwE9mZgeela&>cbEp%vQEn+QcZY^POVRCeBWo~pWGBYA9B6D<MbaitgIwD1GWMyO`eO-M",
+  "created_at": "2022-10-04T02:23:34.538347",
+  "elapsed": 0.414134,
+  "encoding": "utf-8",
+  "headers": {
+    "Content-Type": "application/json; charset=utf-8",
+    "Content-Length": "583",
+    "Connection": "keep-alive",
+    "Date": "Tue, 04 Oct 2022 02:23:34 GMT",
+    "Cache-Control": "private, max-age=86400",
+    "X-Powered-By": "Thundar!",
+    "X-Thetvdb-Api-Version": "3.0.0",
+    "Vary": "Accept-Language",
+    "X-Cache": "Miss from cloudfront",
+    "Via": "1.1 1a03e9a4fd8952cd0e6076f8464b0ae4.cloudfront.net (CloudFront)",
+    "X-Amz-Cf-Pop": "MEL50-C2",
+    "X-Amz-Cf-Id": "9LJlqAC4pvLlgOKaEc7VxGUPfEXgVRKsC7gShtrV1s0ol_KBG5UdqQ=="
+  },
+  "raw": {
+    "decode_content": false,
+    "reason": "OK",
+    "status": 200,
+    "version": 11
+  },
+  "reason": "OK",
+  "request": {
+    "body": "PH%2y",
+    "headers": {
+      "User-Agent": "python-requests/2.28.1",
+      "Accept-Encoding": "gzip, deflate",
+      "Accept": "application/json",
+      "Connection": "keep-alive",
+      "Content-Type": "application/json",
+      "Accept-Language": "en",
+      "Authorization": "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NjU0NTUwMTQsImlkIjoidHZkYl9hcGkgdGVzdHMiLCJvcmlnX2lhdCI6MTY2NDg1MDIxNH0.upspf_taI_ZYPliysxeXyydwD0CU65OgcVuyvBcrfG99iK_D6YO-JRKzz14fnrT2NNCNn6UZdTUuQLFibUEcRLgHf2123tgEZOHDWleA6Xl9TttN68H5DySGJeYHncOk1jxHFdx8yzmhDrH-Cd5lOblaI5wpNqRU1_KWjc-q5l_B7xpVlx4rp9j8HSGO_FL8to1RiRBqtUoJMnd5BJJczLNgIrWevB8OfC-KUecbVb5BaTJ96eK__550j1menQD5o-5-9eXQroPQucoWR3w5LaYmDrhR_xn8FuN7KfnVgvhywbrwFsj0D_J1b8FVN10CuA6mOO6OABRd4npAYuT03A"
+    },
+    "method": "GET",
+    "url": "https://api.thetvdb.com/search/series?name=Don%27t%20Trust%20the%20B----%20in%20Apartment%2023"
+  },
+  "status_code": 200,
+  "url": "https://api.thetvdb.com/search/series?name=Don%27t%20Trust%20the%20B----%20in%20Apartment%2023"
+}