diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2014-11-11 16:40:50 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2014-11-11 16:40:50 +0000 |
| commit | a8ceeec0fd512e287cbf71efff42015787517a5d (patch) | |
| tree | 45643674a31b637799e347f2251c72417e685616 /synapse/util | |
| parent | no evil horizontal textarea resizing (diff) | |
| parent | Fix bugs which broke federation due to changes in function signatures. (diff) | |
| download | synapse-a8ceeec0fd512e287cbf71efff42015787517a5d.tar.xz | |
Merge pull request #12 from matrix-org/federation_authorization
Federation authorization
Diffstat (limited to '')
| -rw-r--r-- | synapse/util/async.py | 7 | ||||
| -rw-r--r-- | synapse/util/jsonobject.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py index 647ea6142c..bf578f8bfb 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py @@ -21,3 +21,10 @@ def sleep(seconds): d = defer.Deferred() reactor.callLater(seconds, d.callback, seconds) return d + + +def run_on_reactor(): + """ This will cause the rest of the function to be invoked upon the next + iteration of the main loop + """ + return sleep(0) \ No newline at end of file diff --git a/synapse/util/jsonobject.py b/synapse/util/jsonobject.py index c91eb897a8..e79b68f661 100644 --- a/synapse/util/jsonobject.py +++ b/synapse/util/jsonobject.py @@ -80,7 +80,7 @@ class JsonEncodedObject(object): def get_full_dict(self): d = { - k: v for (k, v) in self.__dict__.items() + k: _encode(v) for (k, v) in self.__dict__.items() if k in self.valid_keys or k in self.internal_keys } d.update(self.unrecognized_keys) |