more cleanup
This commit is contained in:
parent
6f34e4fd7b
commit
acb84b81e0
15
database.py
15
database.py
|
@ -1,6 +1,5 @@
|
|||
import json
|
||||
from datetime import datetime
|
||||
from hashlib import sha256
|
||||
|
||||
from sqlalchemy import Column, DateTime, Integer, PickleType, String, create_engine
|
||||
from sqlalchemy.ext.declarative import declarative_base, declared_attr
|
||||
|
@ -12,14 +11,6 @@ engine = create_engine('sqlite:///electron.db')
|
|||
db = scoped_session(sessionmaker(bind=engine))
|
||||
|
||||
|
||||
class DateTimeEncoder(json.JSONEncoder):
|
||||
def default(self, o):
|
||||
if isinstance(o, datetime):
|
||||
return o.isoformat()
|
||||
|
||||
return json.JSONEncoder.default(self, o)
|
||||
|
||||
|
||||
Base = declarative_base()
|
||||
|
||||
|
||||
|
@ -39,12 +30,6 @@ class BaseModel(Base):
|
|||
"""
|
||||
return {c.name: getattr(self, c.name) for c in self.__table__.columns}
|
||||
|
||||
def to_json(self):
|
||||
"""
|
||||
Helper method to convert any database row to JSON
|
||||
"""
|
||||
return json.dumps(self.to_dict(), sort_keys=True, cls=DateTimeEncoder)
|
||||
|
||||
|
||||
class Peer(BaseModel):
|
||||
identifier = Column(String(32), primary_key=True)
|
||||
|
|
Loading…
Reference in New Issue