Merge pull request #23 from anxdpanic/dev

2.6 compat format

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~beta6" provider-name="A Talented Community">
+<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="1.0.0~beta7" 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/parser.py

@@ -39,7 +39,7 @@ def clip_embed_wrapper(*args, **kwargs):
 
 
 def m3u8_to_dict(string):
-    log.debug('m3u8_to_dict called for:\n{}'.format(string))
+    log.debug('m3u8_to_dict called for:\n{0}'.format(string))
     d = dict()
     matches = re.finditer(_m3u_pattern, string)
     for m in matches:
@@ -51,12 +51,12 @@ def m3u8_to_dict(string):
             'url': m.group('url'),
             'bandwidth': int(m.group('bandwidth'))
         }
-    log.debug('m3u8_to_dict result:\n{}'.format(d))
+    log.debug('m3u8_to_dict result:\n{0}'.format(d))
     return d
 
 
 def m3u8_to_list(string):
-    log.debug('m3u8_to_list called for:\n{}'.format(string))
+    log.debug('m3u8_to_list called for:\n{0}'.format(string))
     l = list()
     matches = re.finditer(_m3u_pattern, string)
     for m in matches:
@@ -69,12 +69,12 @@ def m3u8_to_list(string):
             'bandwidth': int(m.group('bandwidth'))
         })
 
-    log.debug('m3u8_to_list result:\n{}'.format(l))
+    log.debug('m3u8_to_list result:\n{0}'.format(l))
     return l
 
 
 def clip_embed_to_list(string):
-    log.debug('clip_embed_to_list called for:\n{}'.format(string))
+    log.debug('clip_embed_to_list called for:\n{0}'.format(string))
     match = re.search(_clip_embed_pattern, string)
     l = list()
     if match:
@@ -93,5 +93,5 @@ def clip_embed_to_list(string):
                 'bandwidth': -1
             })
 
-    log.debug('clip_embed_to_list result:\n{}'.format(l))
+    log.debug('clip_embed_to_list result:\n{0}'.format(l))
     return l

resources/lib/twitch/queries.py

@@ -151,15 +151,15 @@ def __init__(self, path, method=methods.GET):
 def assert_new(d, k):
     if k in d:
         v = d.get(k)
-        raise ValueError("Key '{}' already set to '{}'".format(k, v))
+        raise ValueError("Key '{0}' already set to '{1}'".format(k, v))
 
 
 # TODO maybe rename
 def query(f):
     def wrapper(*args, **kwargs):
         qry = f(*args, **kwargs)
         if not isinstance(qry, _Query):
-            raise ValueError('{} did not return a Query, was: {}'.format(f.__name__, repr(qry)))
+            raise ValueError('{0} did not return a Query, was: {1}'.format(f.__name__, repr(qry)))
         log.debug('%s QUERY: url: %s, params: %s, data: %s, '
                   'headers: %r, target_func: %r',
                   qry.method, qry.url, qry.params, qry.data, qry.headers, f.__name__)