diff options
| -rw-r--r-- | archivist/cli.py | 2 | ||||
| -rw-r--r-- | archivist/model.py | 9 | ||||
| -rw-r--r-- | archivist/prefixes.py | 3 |
3 files changed, 4 insertions, 10 deletions
diff --git a/archivist/cli.py b/archivist/cli.py index 8238a30..45a8f09 100644 --- a/archivist/cli.py +++ b/archivist/cli.py @@ -59,7 +59,7 @@ def list_prefixes(): print() for p in Prefix.select(): - print(" * %s (builtin: %s; pseudo: %s)" % (p.name, p.builtin, p.pseudo)) + print(" * %s" % p) def prefix_tag_name(name, prefix=None): if prefix: diff --git a/archivist/model.py b/archivist/model.py index bee6200..375f13d 100644 --- a/archivist/model.py +++ b/archivist/model.py @@ -62,19 +62,14 @@ class Document(BaseModel): @table class Prefix(BaseModel): name = CharField(primary_key = True) - builtin = BooleanField(default = False) - pseudo = BooleanField(default = False) + virtual = BooleanField(default = False) description = CharField(null=True) def __str__ (self): return self.name def __repr__ (self): - if self.builtin: - ext = ' (bp)' if self.pseudo else ' (b)' - else: - ext = '' - + ext = ' (virt)' if self.virtual else '' return "<%s %s%s>" % (self.__class__.__name__, self.name, ext) @table diff --git a/archivist/prefixes.py b/archivist/prefixes.py index a039485..d49729a 100644 --- a/archivist/prefixes.py +++ b/archivist/prefixes.py @@ -43,8 +43,7 @@ class PseudoPrefix: from .model import Prefix return Prefix.get_or_create(name = self.name, defaults={ 'description' : self.description, - 'builtin' : True, - 'pseudo' : True}) + 'virtual' : True}) def check_for(self, document, value): return self.accessor(document) == value |