From 1f3d699a0cff618d74ef2a68efc64add83e5576d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 21 Mar 2017 15:48:52 +0100 Subject: [PATCH] Ran 2to3 on pillar/api/utils/storage.py --- pillar/api/utils/storage.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pillar/api/utils/storage.py b/pillar/api/utils/storage.py index aa3deb83..a9d454e3 100644 --- a/pillar/api/utils/storage.py +++ b/pillar/api/utils/storage.py @@ -27,7 +27,7 @@ def register_backend(backend_name): return wrapper -class Bucket(object): +class Bucket(object, metaclass=abc.ABCMeta): """Can be a GCS bucket or simply a project folder in Pillar :type name: string @@ -36,8 +36,6 @@ class Bucket(object): """ - __metaclass__ = abc.ABCMeta - def __init__(self, name): self.name = name @@ -59,7 +57,7 @@ class Bucket(object): pass -class Blob(object): +class Blob(object, metaclass=abc.ABCMeta): """A wrapper for file or blob objects. :type name: string @@ -67,8 +65,6 @@ class Blob(object): """ - __metaclass__ = abc.ABCMeta - def __init__(self, name, bucket): self.name = name self.bucket = bucket @@ -130,7 +126,7 @@ class Blob(object): mime_category, src_file['format'] = src_file['content_type'].split('/', 1) # Prevent video handling for non-admins. - if not user_has_role(u'admin') and mime_category == 'video': + if not user_has_role('admin') and mime_category == 'video': if src_file['format'].startswith('x-'): xified = src_file['format'] else: