aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-01-20 00:17:05 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-01-20 00:17:05 +0100
commitfbad3a9fb9b0bd6b35d5906e96ead3485fa5f57a (patch)
treeb377eed8a35be27ac138504aa07f6d7dbbf02f4b
parent92edc74e9b1ac16009db60049bb381bfd901013a (diff)
downloadmediagoblin-fbad3a9fb9b0bd6b35d5906e96ead3485fa5f57a.tar.lz
mediagoblin-fbad3a9fb9b0bd6b35d5906e96ead3485fa5f57a.tar.xz
mediagoblin-fbad3a9fb9b0bd6b35d5906e96ead3485fa5f57a.zip
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.
-rw-r--r--mediagoblin/db/sql/base.py19
-rw-r--r--mediagoblin/db/sql/convert.py17
-rw-r--r--mediagoblin/db/sql/extratypes.py17
-rw-r--r--mediagoblin/db/sql/fake.py19
-rw-r--r--mediagoblin/db/sql/models.py33
-rw-r--r--mediagoblin/db/sql/open.py19
6 files changed, 113 insertions, 11 deletions
diff --git a/mediagoblin/db/sql/base.py b/mediagoblin/db/sql/base.py
index 082d498e..6f45b21b 100644
--- a/mediagoblin/db/sql/base.py
+++ b/mediagoblin/db/sql/base.py
@@ -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.query import Query
from sqlalchemy.sql.expression import desc
@@ -49,7 +66,7 @@ class GMGTableBase(object):
def get(self, key):
return getattr(self, key)
- def save(self, validate = True):
+ def save(self, validate=True):
assert validate
sess = object_session(self)
if sess is None:
diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index 88614fd4..ac7a66c2 100644
--- a/mediagoblin/db/sql/convert.py
+++ b/mediagoblin/db/sql/convert.py
@@ -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.db.mongo.util import ObjectId
diff --git a/mediagoblin/db/sql/extratypes.py b/mediagoblin/db/sql/extratypes.py
index 88f556d9..33c9edee 100644
--- a/mediagoblin/db/sql/extratypes.py
+++ b/mediagoblin/db/sql/extratypes.py
@@ -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
diff --git a/mediagoblin/db/sql/fake.py b/mediagoblin/db/sql/fake.py
index ba11bfee..482b85da 100644
--- a/mediagoblin/db/sql/fake.py
+++ b/mediagoblin/db/sql/fake.py
@@ -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
calm the rest of the code base. Or provide super minimal
@@ -10,7 +27,7 @@ Currently:
- InvalidId exception
- DESCENDING "constant"
"""
-
+
DESCENDING = object() # a unique object for this "constant"
diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py
index 91092f33..aa63e34a 100644
--- a/mediagoblin/db/sql/models.py
+++ b/mediagoblin/db/sql/models.py
@@ -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
from sqlalchemy.ext.declarative import declarative_base
@@ -41,8 +58,8 @@ class User(Base, UserMixin):
verification_key = Column(Unicode)
is_admin = Column(Boolean, default=False, nullable=False)
url = Column(Unicode)
- bio = Column(UnicodeText) # ??
- bio_html = Column(UnicodeText) # ??
+ bio = Column(UnicodeText) # ??
+ bio_html = Column(UnicodeText) # ??
fp_verification_key = Column(Unicode)
fp_token_expire = Column(DateTime)
@@ -60,11 +77,11 @@ class MediaEntry(Base, MediaEntryMixin):
title = Column(Unicode, nullable=False)
slug = Column(Unicode, nullable=False)
created = Column(DateTime, nullable=False, default=datetime.datetime.now)
- description = Column(UnicodeText) # ??
- description_html = Column(UnicodeText) # ??
+ description = Column(UnicodeText) # ??
+ description_html = Column(UnicodeText) # ??
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_metadata = Column(UnicodeText)
@@ -83,7 +100,7 @@ class MediaEntry(Base, MediaEntryMixin):
cascade="all, delete-orphan"
)
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
@@ -130,7 +147,7 @@ class MediaTag(Base):
class MediaComment(Base):
__tablename__ = "media_comments"
-
+
id = Column(Integer, primary_key=True)
media_entry = Column(
Integer, ForeignKey('media_entries.id'), nullable=False)
diff --git a/mediagoblin/db/sql/open.py b/mediagoblin/db/sql/open.py
index c682bd3b..3c06c676 100644
--- a/mediagoblin/db/sql/open.py
+++ b/mediagoblin/db/sql/open.py
@@ -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 mediagoblin.db.sql.base import Session
@@ -8,7 +25,7 @@ class DatabaseMaster(object):
def __init__(self, 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)
def commit(self):