Skip to content

Commit 7d2dbbd

Browse files
anxdpanicanxdpanic
authored
Merge pull request #46 from anxdpanic/dev
 2.0.1
2 parents b18be5a + dc5be97 commit 7d2dbbd

36 files changed

+184
-149
lines changed

‎addon.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="2.0.0" provider-name="A Talented Community">
2+
<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="2.0.1" provider-name="A Talented Community">
33
<requires>
44
<import addon="xbmc.python" version="2.20.0"/>
55
<import addon="script.module.six" version="1.9.0"/>
@@ -9,12 +9,9 @@
99
<extension point="xbmc.addon.metadata">
1010
<platform>all</platform>
1111
<news>
12-
[chg] refactor oauth for inclusion of helix
13-
[add] helix api
14-
[add] add usher.live_request and usher.video_request
15-
[add] MobileClient().revoke_token and MobileClient().get_app_access_token queries
16-
[add] Kodi logging
17-
[add] v5 users.users
12+
[fix] clips usher
13+
[chg] to relative imports
14+
[upd] deprecation/removal dates
1815
</news>
1916
<assets>
2017
<icon>icon.png</icon>
@@ -25,5 +22,6 @@
2522
<license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
2623
<forum> </forum>
2724
<source>https://github.com/MrSprigster/script.module.python.twitch</source>
25+
<reuselanguageinvoker>true</reuselanguageinvoker>
2826
</extension>
2927
</addon>

‎changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2.0.1
2+
[fix] clips usher
3+
[chg] to relative imports
4+
[upd] deprecation/removal dates
5+
16
2.0.0
27
[chg] refactor oauth for inclusion of helix
38
- adds MobileClient().prepare_token_uri() for generating app access tokens, adds client_secret requirement

‎resources/lib/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
__all__ = ['twitch']
3+
4+
from . import twitch

‎resources/lib/twitch/__init__.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
# -*- encoding: utf-8 -*-
22

3+
__all__ = ['VERSION', 'CLIENT_ID', 'CLIENT_SECRET', 'OAUTH_TOKEN', 'APP_TOKEN', 'api', 'oauth',
4+
'exceptions', 'keys', 'log', 'methods', 'parser', 'queries', 'scraper']
5+
36
VERSION = '2.0.0'
47
CLIENT_ID = ''
58
CLIENT_SECRET = ''
69
OAUTH_TOKEN = ''
710
APP_TOKEN = ''
11+
12+
from . import api
13+
from . import oauth
14+
from . import exceptions
15+
from . import keys
16+
from . import log
17+
from . import methods
18+
from . import parser
19+
from . import queries
20+
from . import scraper

‎resources/lib/twitch/api/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# -*- encoding: utf-8 -*-
22

3-
from twitch.api import v5 # V5 is deprecated and will be removed entirely on 2/14/18
4-
from twitch.api import v5 as default
5-
from twitch.api import helix
3+
__all__ = ['v5', 'default', 'helix', 'parameters', 'usher']
64

7-
__all__ = ['v5', 'default', 'helix']
5+
from . import v5 # V5 is deprecated and will be removed entirely on 12/31/18
6+
from . import v5 as default
7+
from . import helix
8+
from . import parameters
9+
from . import usher

‎resources/lib/twitch/api/helix/__init__.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# -*- encoding: utf-8 -*-
22
# https://dev.twitch.tv/docs/
33

4-
from twitch.api.helix import clips # NOQA
5-
from twitch.api.helix import games # NOQA
6-
from twitch.api.helix import streams # NOQA
7-
from twitch.api.helix import users # NOQA
8-
from twitch.api.helix import videos # NOQA
4+
__all__ = ['clips', 'games', 'streams', 'users', 'videos']
5+
6+
from . import clips # NOQA
7+
from . import games # NOQA
8+
from . import streams # NOQA
9+
from . import users # NOQA
10+
from . import videos # NOQA

‎resources/lib/twitch/api/helix/clips.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# -*- encoding: utf-8 -*-
22
# https://dev.twitch.tv/docs/api/reference
33

4-
from twitch import keys, methods
5-
from twitch.queries import HelixQuery as Qry
6-
from twitch.queries import query
4+
from ... import keys, methods
5+
from ...queries import HelixQuery as Qry
6+
from ...queries import query
77

88

99
# required scope: none

‎resources/lib/twitch/api/helix/games.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# -*- encoding: utf-8 -*-
22
# https://dev.twitch.tv/docs/api/reference
33

4-
from twitch import keys
5-
from twitch.api.parameters import Cursor
6-
from twitch.queries import HelixQuery as Qry
7-
from twitch.queries import query
4+
from ... import keys
5+
from ...api.parameters import Cursor
6+
from ...queries import HelixQuery as Qry
7+
from ...queries import query
88

99

1010
# required scope: none

‎resources/lib/twitch/api/helix/streams.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# -*- encoding: utf-8 -*-
22
# https://dev.twitch.tv/docs/api/reference
33

4-
from twitch import keys
5-
from twitch.api.parameters import Cursor, Language, StreamTypeHelix
6-
from twitch.queries import HelixQuery as Qry
7-
from twitch.queries import query
4+
from ... import keys
5+
from ...api.parameters import Cursor, Language, StreamTypeHelix
6+
from ...queries import HelixQuery as Qry
7+
from ...queries import query
88

99

1010
# required scope: none

‎resources/lib/twitch/api/helix/users.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# -*- encoding: utf-8 -*-
22
# https://dev.twitch.tv/docs/api/reference
33

4-
from twitch import keys, methods
5-
from twitch.api.parameters import Cursor
6-
from twitch.queries import HelixQuery as Qry
7-
from twitch.queries import query
4+
from ... import keys, methods
5+
from ...api.parameters import Cursor
6+
from ...queries import HelixQuery as Qry
7+
from ...queries import query
88

99

1010
# optional scope: user:read:email

0 commit comments

Comments
 (0)