backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

keys starting with underscore are not part of the document

Browse Source
This commit is contained in:
Noah Levitt 2017-02-24 16:40:33 -08:00
parent abdecc46b8
commit 3c1faded3c
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rethinkstuff/orm.py
View File

@ -178,20 +178,24 @@ class Document(dict, object):
rethinker.table_create(cls.table).run() rethinker.table_create(cls.table).run()
def __init__(self, rethinker, d={}): def __init__(self, rethinker, d={}):
dict.__setattr__(self, '_r', rethinker) self._r = rethinker
dict.__setattr__(self, '_pk', None) self._pk = None
self._clear_updates() self._clear_updates()
for k in d: for k in d:
self[k] = watch(d[k], callback=self._updated, field=k) self[k] = watch(d[k], callback=self._updated, field=k)
def _clear_updates(self): def _clear_updates(self):
dict.__setattr__(self, '_updates', {}) self._updates = {}
dict.__setattr__(self, '_deletes', set()) self._deletes = set()
def __setitem__(self, key, value): def __setitem__(self, key, value):
dict.__setitem__( # keys starting with underscore are not part of the document
self, key, watch(value, callback=self._updated, field=key)) if key[:1] == '_':
self._updated(key) dict.__setattr__(self, key, value)
else:
dict.__setitem__(
self, key, watch(value, callback=self._updated, field=key))
self._updated(key)
__setattr__ = __setitem__ __setattr__ = __setitem__
__getattr__ = dict.__getitem__ __getattr__ = dict.__getitem__
@ -223,7 +227,7 @@ class Document(dict, object):
pk = self._r.db('rethinkdb').table('table_config').filter({ pk = self._r.db('rethinkdb').table('table_config').filter({
'db': self._r.dbname, 'name': self.table}).get_field( 'db': self._r.dbname, 'name': self.table}).get_field(
'primary_key')[0].run() 'primary_key')[0].run()
dict.__setattr__(self, '_pk', pk) self._pk = pk
except Exception as e: except Exception as e:
raise Exception( raise Exception(
'problem determining primary key for table %s.%s: %s', 'problem determining primary key for table %s.%s: %s',
@ -293,4 +297,3 @@ class Document(dict, object):
dict.__setitem__( dict.__setitem__(
self, k, watch(d[k], callback=self._updated, field=k)) self, k, watch(d[k], callback=self._updated, field=k))

4
setup.py
View File

@ -3,7 +3,7 @@ import codecs
setuptools.setup( setuptools.setup(
name='rethinkstuff', name='rethinkstuff',
version='0.2.0.dev60', version='0.2.0.dev61',
packages=['rethinkstuff'], packages=['rethinkstuff'],
classifiers=[ classifiers=[
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
@ -15,7 +15,7 @@ setuptools.setup(
url='https://github.com/nlevitt/rethinkstuff', url='https://github.com/nlevitt/rethinkstuff',
author='Noah Levitt', author='Noah Levitt',
author_email='nlevitt@archive.org', author_email='nlevitt@archive.org',
description='Rudimentary rethinkdb python library with some smarts, perhaps some dumbs', description='rethinkdb python library',
long_description=codecs.open( long_description=codecs.open(
'README.rst', mode='r', encoding='utf-8').read(), 'README.rst', mode='r', encoding='utf-8').read(),
) )