formatting

This commit is contained in:
evilchili 2024-04-20 20:35:24 -07:00
parent 412efe2aec
commit a9593e83a2
7 changed files with 13 additions and 6 deletions

View File

@ -105,6 +105,7 @@ def setup(context: typer.Context):
@db_app.command()
def list(context: typer.Context):
from ttfrog.db.manager import db
print("\n".join(sorted(db.tables.keys())))
@ -114,6 +115,7 @@ def dump(context: typer.Context):
Dump tables (or the entire database) as a JSON blob.
"""
from ttfrog.db.manager import db
db.init()
print(db.dump(context.args))

View File

@ -23,6 +23,7 @@ class BaseObject(_BaseObject):
"""
Allows for iterating over Model objects' column names and values
"""
__abstract__ = True
def __iter__(self):

View File

@ -10,7 +10,6 @@ from pyramid_sqlalchemy import Session, init_sqlalchemy
from pyramid_sqlalchemy import metadata as _metadata
from sqlalchemy import create_engine
import ttfrog.db.schema
from ttfrog.path import database
@ -20,7 +19,7 @@ assert ttfrog.db.schema
class AlchemyEncoder(json.JSONEncoder):
def default(self, obj):
try:
return getattr(obj, '__json__')()
return getattr(obj, "__json__")()
except (AttributeError, NotImplementedError): # pragma: no cover
return super().default(obj)

View File

@ -1,4 +1,4 @@
from .character import *
from .classes import *
from .property import *
from .log import *
from .property import *

View File

@ -32,14 +32,18 @@ def db(monkeypatch):
@pytest.fixture
def classes_factory(db):
load_fixture(db, "classes")
def factory():
return dict((rec.name, rec) for rec in db.session.query(schema.CharacterClass).all())
return factory
@pytest.fixture
def ancestries_factory(db):
load_fixture(db, "ancestry")
def factory():
return dict((rec.name, rec) for rec in db.session.query(schema.Ancestry).all())
return factory

View File

@ -1,4 +1,5 @@
import json
from ttfrog.db import schema