0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

port to python3

Browse source
This commit is contained in:
j 2014-09-03 00:32:44 +02:00
commit 8e27b9f76e
51 changed files with 272 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

4
oml/user/api.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4
from __future__ import division
from copy import deepcopy
import json
@ -11,7 +11,7 @@ import ox
from changelog import Changelog
from oxtornado import actions
from utils import update_dict
import models
from . import models
import settings
import state

9
oml/user/models.py
View file

@ -9,6 +9,7 @@ from changelog import Changelog
from db import MutableDict
from queryparser import Parser
import db
import json_pickler
import settings
import state
@ -22,7 +23,7 @@ class User(db.Model):
modified = sa.Column(sa.DateTime())
id = sa.Column(sa.String(43), primary_key=True)
info = sa.Column(MutableDict.as_mutable(sa.PickleType(pickler=json)))
info = sa.Column(MutableDict.as_mutable(sa.PickleType(pickler=json_pickler)))
nickname = sa.Column(sa.String(256), unique=True)
@ -140,7 +141,7 @@ class List(db.Model):
index_ = sa.Column(sa.Integer())
type = sa.Column(sa.String(64))
_query = sa.Column('query', MutableDict.as_mutable(sa.PickleType(pickler=json)))
_query = sa.Column('query', MutableDict.as_mutable(sa.PickleType(pickler=json_pickler)))
user_id = sa.Column(sa.String(43), sa.ForeignKey('user.id'))
user = sa.orm.relationship('User', backref=sa.orm.backref('lists', lazy='dynamic'))
@ -250,7 +251,7 @@ class List(db.Model):
id = ''
if self.user_id != settings.USER_ID:
id += self.user.nickname
id = u'%s:%s' % (id, self.name)
id = '%s:%s' % (id, self.name)
return id
@property
@ -258,7 +259,7 @@ class List(db.Model):
id = ''
if self.user_id != settings.USER_ID:
id += self.user_id
id = u'%s:%s' % (id, self.id)
id = '%s:%s' % (id, self.id)
return id
def __repr__(self):