Merge pull request #22 from anxdpanic/dev

add language parameter to clips, disable cert verify in python <2.7.9

Author: anxdpanic

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="1.0.0~beta5" provider-name="A Talented Community">
+<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="1.0.0~beta6" provider-name="A Talented Community">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
         <import addon="script.module.six" version="1.9.0"/>

resources/lib/twitch/api/v5/clips.py

@@ -2,7 +2,7 @@
 # https://dev.twitch.tv/docs/v5/reference/clips/
 
 from twitch import keys
-from twitch.api.parameters import Boolean, ClipPeriod, Cursor
+from twitch.api.parameters import Boolean, ClipPeriod, Cursor, Language
 from twitch.queries import V5Query as Qry
 from twitch.queries import query
 
@@ -17,22 +17,25 @@ def by_slug(slug):
 
 # required scope: None
 @query
-def get_top(channels=None, games=None, period=ClipPeriod.WEEK, trending=Boolean.FALSE, cursor='MA==', limit=10):
+def get_top(channels=None, games=None, period=ClipPeriod.WEEK, trending=Boolean.FALSE,
+            language=Language.ALL, cursor='MA==', limit=10):
     q = Qry('clips/top')
     q.add_param(keys.CHANNEL, channels, None)
     q.add_param(keys.GAME, games, None)
     q.add_param(keys.PERIOD, ClipPeriod.validate(period), ClipPeriod.WEEK)
     q.add_param(keys.TRENDING, Boolean.validate(trending), Boolean.FALSE)
+    q.add_param(keys.LANGUAGE, Language.validate(language), Language.ALL)
     q.add_param(keys.LIMIT, limit, 10)
     q.add_param(keys.CURSOR, Cursor.validate(cursor), 'MA==')
     return q
 
 
 # required scope: user_read
 @query
-def get_followed(trending=Boolean.FALSE, cursor='MA==', limit=10):
+def get_followed(trending=Boolean.FALSE, language=Language.ALL, cursor='MA==', limit=10):
     q = Qry('clips/followed')
     q.add_param(keys.TRENDING, Boolean.validate(trending), Boolean.FALSE)
+    q.add_param(keys.LANGUAGE, Language.validate(language), Language.ALL)
     q.add_param(keys.LIMIT, limit, 10)
     q.add_param(keys.CURSOR, Cursor.validate(cursor), 'MA==')
     return q

resources/lib/twitch/scraper.py

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+import sys
 import requests
 # import six
 from six.moves.urllib.error import URLError
@@ -15,6 +16,10 @@
 except:
     import simplejson as json  # @UnresolvedImport
 
+SSL_VERIFICATION = True
+if sys.version_info <= (2, 7, 9):
+    SSL_VERIFICATION = False
+
 MAX_RETRIES = 5
 
 
@@ -51,7 +56,7 @@ def download(baseurl, parameters={}, headers={}, data={}, method=methods.GET):
     for _ in range(MAX_RETRIES):
         try:
             headers.update({USER_AGENT: USER_AGENT_STRING})
-            response = requests.request(method=method, url=url, headers=headers, data=data)
+            response = requests.request(method=method, url=url, headers=headers, data=data, verify=SSL_VERIFICATION)
             content = response.content
             if not content:
                 content = '{"status": %d}' % response.status_code