Run pyupgrade for 3.7

m3u8/__init__.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.

m3u8/mixins.py

@@ -2,7 +2,7 @@
 from urllib.parse import urljoin, urlsplit
 
 
-class BasePathMixin(object):
+class BasePathMixin:
     @property
     def absolute_uri(self):
         if self.uri is None:
@@ -31,12 +31,12 @@ def get_path_from_uri(self):
     def base_path(self, newbase_path):
         if self.uri is not None:
             if not self.base_path:
-                self.uri = "%s/%s" % (newbase_path, self.uri)
+                self.uri = f"{newbase_path}/{self.uri}"
             else:
                 self.uri = self.uri.replace(self.base_path, newbase_path)
 
 
-class GroupedBasePathMixin(object):
+class GroupedBasePathMixin:
     def _set_base_uri(self, new_base_uri):
         for item in self:
             item.base_uri = new_base_uri

m3u8/model.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.
@@ -22,7 +21,7 @@ class MalformedPlaylistError(Exception):
     pass
 
 
-class M3U8(object):
+class M3U8:
     """
     Represents a single M3U8 playlist. Should be instantiated with
     the content as string.
@@ -376,7 +375,7 @@ def dumps(self):
             output.append("#EXT-X-MEDIA-SEQUENCE:" + str(self.media_sequence))
         if self.discontinuity_sequence:
             output.append(
-                "#EXT-X-DISCONTINUITY-SEQUENCE:{}".format(self.discontinuity_sequence)
+                f"#EXT-X-DISCONTINUITY-SEQUENCE:{self.discontinuity_sequence}"
             )
         if self.allow_cache:
             output.append("#EXT-X-ALLOW-CACHE:" + self.allow_cache.upper())
@@ -680,7 +679,7 @@ def __str__(self):
 
     @property
     def base_path(self):
-        return super(Segment, self).base_path
+        return super().base_path
 
     @base_path.setter
     def base_path(self, newbase_path):
@@ -995,7 +994,7 @@ def __str__(self):
             else:
                 media_types += [media.type]
                 media_type = media.type.upper()
-                stream_inf.append('%s="%s"' % (media_type, media.group_id))
+                stream_inf.append(f'{media_type}="{media.group_id}"')
 
         return "#EXT-X-STREAM-INF:" + ",".join(stream_inf) + "\n" + self.uri
 
@@ -1087,7 +1086,7 @@ def __str__(self):
         return "#EXT-X-I-FRAME-STREAM-INF:" + ",".join(iframe_stream_inf)
 
 
-class StreamInfo(object):
+class StreamInfo:
     bandwidth = None
     closed_captions = None
     average_bandwidth = None
@@ -1266,7 +1265,7 @@ class SessionDataList(TagList):
     pass
 
 
-class Start(object):
+class Start:
     def __init__(self, time_offset, precise=None):
         self.time_offset = float(time_offset)
         self.precise = precise
@@ -1305,7 +1304,7 @@ def __str__(self):
         return "\n".join(output)
 
 
-class ServerControl(object):
+class ServerControl:
     def __init__(
         self,
         can_skip_until=None,
@@ -1346,7 +1345,7 @@ def __str__(self):
         return self.dumps()
 
 
-class Skip(object):
+class Skip:
     def __init__(self, skipped_segments, recently_removed_dateranges=None):
         self.skipped_segments = skipped_segments
         self.recently_removed_dateranges = recently_removed_dateranges
@@ -1366,7 +1365,7 @@ def __str__(self):
         return self.dumps()
 
 
-class PartInformation(object):
+class PartInformation:
     def __init__(self, part_target=None):
         self.part_target = part_target
 
@@ -1397,15 +1396,15 @@ def dumps(self):
 
         for attr in ["byterange_start", "byterange_length"]:
             if self[attr] is not None:
-                hint.append("%s=%s" % (denormalize_attribute(attr), self[attr]))
+                hint.append(f"{denormalize_attribute(attr)}={self[attr]}")
 
         return "#EXT-X-PRELOAD-HINT:" + ",".join(hint)
 
     def __str__(self):
         return self.dumps()
 
 
-class SessionData(object):
+class SessionData:
     def __init__(self, data_id, value=None, uri=None, language=None):
         self.data_id = data_id
         self.value = value
@@ -1432,7 +1431,7 @@ class DateRangeList(TagList):
     pass
 
 
-class DateRange(object):
+class DateRange:
     def __init__(self, **kwargs):
         self.id = kwargs["id"]
         self.start_date = kwargs.get("start_date")
@@ -1479,7 +1478,7 @@ def dumps(self):
 
         # client attributes sorted alphabetically output order is predictable
         for attr, value in sorted(self.x_client_attrs):
-            daterange.append("%s=%s" % (denormalize_attribute(attr), value))
+            daterange.append(f"{denormalize_attribute(attr)}={value}")
 
         return "#EXT-X-DATERANGE:" + ",".join(daterange)
 

m3u8/parser.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.

m3u8/protocol.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.

tests/m3u8server.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.

tests/playlists.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.

tests/test_loader.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.
@@ -77,28 +76,28 @@ def test_load_should_create_object_from_uri_with_relative_segments():
     urlparsed = urllib.parse.urlparse(playlists.RELATIVE_PLAYLIST_URI)
     base_uri = os.path.normpath(urlparsed.path + "/..")
     prefix = urlparsed.scheme + "://" + urlparsed.netloc
-    expected_key_abspath = "%s%skey.bin" % (
+    expected_key_abspath = "{}{}key.bin".format(
         prefix,
         os.path.normpath(base_uri + "/..") + "/",
     )
     expected_key_path = "../key.bin"
-    expected_ts1_abspath = "%s%sentire1.ts" % (prefix, "/")
+    expected_ts1_abspath = "{}{}entire1.ts".format(prefix, "/")
     expected_ts1_path = "/entire1.ts"
-    expected_ts2_abspath = "%s%sentire2.ts" % (
+    expected_ts2_abspath = "{}{}entire2.ts".format(
         prefix,
         os.path.normpath(base_uri + "/..") + "/",
     )
     expected_ts2_path = "../entire2.ts"
-    expected_ts3_abspath = "%s%sentire3.ts" % (
+    expected_ts3_abspath = "{}{}entire3.ts".format(
         prefix,
         os.path.normpath(base_uri + "/../.."),
     )
     expected_ts3_path = "../../entire3.ts"
-    expected_ts4_abspath = "%s%sentire4.ts" % (prefix, base_uri + "/")
+    expected_ts4_abspath = "{}{}entire4.ts".format(prefix, base_uri + "/")
     expected_ts4_path = "entire4.ts"
-    expected_ts5_abspath = "%s%sentire5.ts" % (prefix, base_uri + "/")
+    expected_ts5_abspath = "{}{}entire5.ts".format(prefix, base_uri + "/")
     expected_ts5_path = "./entire5.ts"
-    expected_ts6_abspath = "%s%sentire6.ts" % (prefix, base_uri + "/")
+    expected_ts6_abspath = "{}{}entire6.ts".format(prefix, base_uri + "/")
     expected_ts6_path = ".//entire6.ts"
 
     assert isinstance(obj, m3u8.M3U8)

tests/test_model.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.

tests/test_parser.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.

tests/test_strict_validations.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.

tests/test_variant_m3u8.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2014 Globo.com Player authors. All rights reserved.
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.