Skip to content
Snippets Groups Projects

Improved tests and fixed a few bugs

Merged Duncan Macleod requested to merge more-tests into master
7 files
+ 129
44
Compare changes
  • Side-by-side
  • Inline
Files
7
@@ -43,11 +43,11 @@ class DataFlask(Flask):
def get_cache_data(self, *keys):
while not self.manager.ready:
# cache file is not ready
self.logger.debug("Waiting for cache...")
time.sleep(.5)
self.manager.lock.acquire()
try:
print(self.manager.cache)
return self._get_cache_data(keys)
finally:
self.manager.lock.release()
@@ -59,10 +59,7 @@ class DataFlask(Flask):
return self.manager.cache.get(last, {})
ent = self.manager.cache.get(keys.pop(0), {})
for key in keys:
try:
ent = ent[key]
except KeyError:
return {}
ent = ent[key]
return ent.get(last, {})
def shutdown(self):
Loading