Add copyright header and a bit of pep8ification

Nearly all the sql files missed a copyright header.
So added it!
And while there fixed a few pep8 things.
This commit is contained in:
Elrond 2012-01-20 00:17:05 +01:00
parent 92edc74e9b
commit fbad3a9fb9
6 changed files with 113 additions and 11 deletions

View File

@ -1,3 +1,20 @@
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011,2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from sqlalchemy.orm import scoped_session, sessionmaker, object_session from sqlalchemy.orm import scoped_session, sessionmaker, object_session
from sqlalchemy.orm.query import Query from sqlalchemy.orm.query import Query
from sqlalchemy.sql.expression import desc from sqlalchemy.sql.expression import desc
@ -49,7 +66,7 @@ class GMGTableBase(object):
def get(self, key): def get(self, key):
return getattr(self, key) return getattr(self, key)
def save(self, validate = True): def save(self, validate=True):
assert validate assert validate
sess = object_session(self) sess = object_session(self)
if sess is None: if sess is None:

View File

@ -1,3 +1,20 @@
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011,2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from mediagoblin.init import setup_global_and_app_config, setup_database from mediagoblin.init import setup_global_and_app_config, setup_database
from mediagoblin.db.mongo.util import ObjectId from mediagoblin.db.mongo.util import ObjectId

View File

@ -1,3 +1,20 @@
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011,2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from sqlalchemy.types import TypeDecorator, Unicode from sqlalchemy.types import TypeDecorator, Unicode

View File

@ -1,3 +1,20 @@
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011,2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
This module contains some fake classes and functions to This module contains some fake classes and functions to
calm the rest of the code base. Or provide super minimal calm the rest of the code base. Or provide super minimal

View File

@ -1,3 +1,20 @@
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011,2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import datetime import datetime
from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.declarative import declarative_base
@ -41,8 +58,8 @@ class User(Base, UserMixin):
verification_key = Column(Unicode) verification_key = Column(Unicode)
is_admin = Column(Boolean, default=False, nullable=False) is_admin = Column(Boolean, default=False, nullable=False)
url = Column(Unicode) url = Column(Unicode)
bio = Column(UnicodeText) # ?? bio = Column(UnicodeText) # ??
bio_html = Column(UnicodeText) # ?? bio_html = Column(UnicodeText) # ??
fp_verification_key = Column(Unicode) fp_verification_key = Column(Unicode)
fp_token_expire = Column(DateTime) fp_token_expire = Column(DateTime)
@ -60,10 +77,10 @@ class MediaEntry(Base, MediaEntryMixin):
title = Column(Unicode, nullable=False) title = Column(Unicode, nullable=False)
slug = Column(Unicode, nullable=False) slug = Column(Unicode, nullable=False)
created = Column(DateTime, nullable=False, default=datetime.datetime.now) created = Column(DateTime, nullable=False, default=datetime.datetime.now)
description = Column(UnicodeText) # ?? description = Column(UnicodeText) # ??
description_html = Column(UnicodeText) # ?? description_html = Column(UnicodeText) # ??
media_type = Column(Unicode, nullable=False) media_type = Column(Unicode, nullable=False)
state = Column(Unicode, nullable=False) # or use sqlalchemy.types.Enum? state = Column(Unicode, nullable=False) # or use sqlalchemy.types.Enum?
fail_error = Column(Unicode) fail_error = Column(Unicode)
fail_metadata = Column(UnicodeText) fail_metadata = Column(UnicodeText)
@ -83,7 +100,7 @@ class MediaEntry(Base, MediaEntryMixin):
cascade="all, delete-orphan" cascade="all, delete-orphan"
) )
media_files = association_proxy('media_files_helper', 'file_path', media_files = association_proxy('media_files_helper', 'file_path',
creator=lambda k,v: MediaFile(name=k, file_path=v) creator=lambda k, v: MediaFile(name=k, file_path=v)
) )
## TODO ## TODO

View File

@ -1,3 +1,20 @@
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011,2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from sqlalchemy import create_engine from sqlalchemy import create_engine
from mediagoblin.db.sql.base import Session from mediagoblin.db.sql.base import Session
@ -8,7 +25,7 @@ class DatabaseMaster(object):
def __init__(self, engine): def __init__(self, engine):
self.engine = engine self.engine = engine
for k,v in Base._decl_class_registry.iteritems(): for k, v in Base._decl_class_registry.iteritems():
setattr(self, k, v) setattr(self, k, v)
def commit(self): def commit(self):