From a5acfe23fadc4772fdd6fd63091c32621b94d710 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Mon, 7 Jan 2013 13:03:33 +0100 Subject: Move mediagoblin.db.sql.extratypes to mediagoblin.db.extratypes No other functional changes. --- mediagoblin/db/extratypes.py | 63 ++++++++++++++++++++++++++++++++++++++++ mediagoblin/db/models.py | 2 +- mediagoblin/db/models_v0.py | 2 +- mediagoblin/db/sql/extratypes.py | 63 ---------------------------------------- 4 files changed, 65 insertions(+), 65 deletions(-) create mode 100644 mediagoblin/db/extratypes.py delete mode 100644 mediagoblin/db/sql/extratypes.py (limited to 'mediagoblin/db') diff --git a/mediagoblin/db/extratypes.py b/mediagoblin/db/extratypes.py new file mode 100644 index 00000000..f2304af0 --- /dev/null +++ b/mediagoblin/db/extratypes.py @@ -0,0 +1,63 @@ +# 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 . + + +from sqlalchemy.types import TypeDecorator, Unicode, TEXT +import json + + +class PathTupleWithSlashes(TypeDecorator): + "Represents a Tuple of strings as a slash separated string." + + impl = Unicode + + def process_bind_param(self, value, dialect): + if value is not None: + if len(value) == 0: + value = None + else: + value = '/'.join(value) + return value + + def process_result_value(self, value, dialect): + if value is not None: + value = tuple(value.split('/')) + return value + + +# The following class and only this one class is in very +# large parts based on example code from sqlalchemy. +# +# The original copyright notice and license follows: +# Copyright (C) 2005-2011 the SQLAlchemy authors and contributors +# +# This module is part of SQLAlchemy and is released under +# the MIT License: http://www.opensource.org/licenses/mit-license.php +# +class JSONEncoded(TypeDecorator): + "Represents an immutable structure as a json-encoded string." + + impl = TEXT + + def process_bind_param(self, value, dialect): + if value is not None: + value = json.dumps(value) + return value + + def process_result_value(self, value, dialect): + if value is not None: + value = json.loads(value) + return value diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 4450e38d..54f9abbc 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -31,7 +31,7 @@ from sqlalchemy.sql.expression import desc from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.util import memoized_property -from mediagoblin.db.sql.extratypes import PathTupleWithSlashes, JSONEncoded +from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded from mediagoblin.db.sql.base import Base, DictReadAttrProxy from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, MediaCommentMixin, CollectionMixin, CollectionItemMixin from mediagoblin.db.sql.base import Session diff --git a/mediagoblin/db/models_v0.py b/mediagoblin/db/models_v0.py index 06f87d28..742c4652 100644 --- a/mediagoblin/db/models_v0.py +++ b/mediagoblin/db/models_v0.py @@ -31,7 +31,7 @@ from sqlalchemy.orm.collections import attribute_mapped_collection from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.util import memoized_property -from mediagoblin.db.sql.extratypes import PathTupleWithSlashes, JSONEncoded +from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded from mediagoblin.db.sql.base import GMGTableBase from mediagoblin.db.sql.base import Session diff --git a/mediagoblin/db/sql/extratypes.py b/mediagoblin/db/sql/extratypes.py deleted file mode 100644 index f2304af0..00000000 --- a/mediagoblin/db/sql/extratypes.py +++ /dev/null @@ -1,63 +0,0 @@ -# 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 . - - -from sqlalchemy.types import TypeDecorator, Unicode, TEXT -import json - - -class PathTupleWithSlashes(TypeDecorator): - "Represents a Tuple of strings as a slash separated string." - - impl = Unicode - - def process_bind_param(self, value, dialect): - if value is not None: - if len(value) == 0: - value = None - else: - value = '/'.join(value) - return value - - def process_result_value(self, value, dialect): - if value is not None: - value = tuple(value.split('/')) - return value - - -# The following class and only this one class is in very -# large parts based on example code from sqlalchemy. -# -# The original copyright notice and license follows: -# Copyright (C) 2005-2011 the SQLAlchemy authors and contributors -# -# This module is part of SQLAlchemy and is released under -# the MIT License: http://www.opensource.org/licenses/mit-license.php -# -class JSONEncoded(TypeDecorator): - "Represents an immutable structure as a json-encoded string." - - impl = TEXT - - def process_bind_param(self, value, dialect): - if value is not None: - value = json.dumps(value) - return value - - def process_result_value(self, value, dialect): - if value is not None: - value = json.loads(value) - return value -- cgit v1.2.3