archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Ran 2to3 on pillar/api/utils/storage.py

Browse Source
This commit is contained in:
Sybren A. Stüvel 2017-03-21 15:48:52 +01:00
parent 0eb2f17624
commit 1f3d699a0c
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pillar/api/utils/storage.py
View File

@ -27,7 +27,7 @@ def register_backend(backend_name):
return wrapper return wrapper
class Bucket(object): class Bucket(object, metaclass=abc.ABCMeta):
"""Can be a GCS bucket or simply a project folder in Pillar """Can be a GCS bucket or simply a project folder in Pillar
:type name: string :type name: string
@ -36,8 +36,6 @@ class Bucket(object):
""" """
__metaclass__ = abc.ABCMeta
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name
@ -59,7 +57,7 @@ class Bucket(object):
pass pass
class Blob(object): class Blob(object, metaclass=abc.ABCMeta):
"""A wrapper for file or blob objects. """A wrapper for file or blob objects.
:type name: string :type name: string
@ -67,8 +65,6 @@ class Blob(object):
""" """
__metaclass__ = abc.ABCMeta
def __init__(self, name, bucket): def __init__(self, name, bucket):
self.name = name self.name = name
self.bucket = bucket self.bucket = bucket
@ -130,7 +126,7 @@ class Blob(object):
mime_category, src_file['format'] = src_file['content_type'].split('/', mime_category, src_file['format'] = src_file['content_type'].split('/',
1) 1)
# Prevent video handling for non-admins. # 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-'): if src_file['format'].startswith('x-'):
xified = src_file['format'] xified = src_file['format']
else: else: