diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-04-08 14:01:56 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-08 14:01:56 +0100 |
commit | 7e2f971c08250cf432d43dd6244faefb2074ff8c (patch) | |
tree | aa3987ef26f11dc98651a28c587ecb63155e8156 /synapse/util | |
parent | Merge pull request #710 from matrix-org/markjh/move_fire (diff) | |
download | synapse-7e2f971c08250cf432d43dd6244faefb2074ff8c.tar.xz |
Remove some unused functions (#711)
* Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want
Diffstat (limited to 'synapse/util')
-rw-r--r-- | synapse/util/__init__.py | 3 | ||||
-rw-r--r-- | synapse/util/ratelimitutils.py | 14 | ||||
-rw-r--r-- | synapse/util/stringutils.py | 4 |
3 files changed, 0 insertions, 21 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 3b9da5b34a..b462495eb8 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -49,9 +49,6 @@ class Clock(object): l.start(msec / 1000.0, now=False) return l - def stop_looping_call(self, loop): - loop.stop() - def call_later(self, delay, callback, *args, **kwargs): """Call something later diff --git a/synapse/util/ratelimitutils.py b/synapse/util/ratelimitutils.py index 4076eed269..1101881a2d 100644 --- a/synapse/util/ratelimitutils.py +++ b/synapse/util/ratelimitutils.py @@ -100,20 +100,6 @@ class _PerHostRatelimiter(object): self.current_processing = set() self.request_times = [] - def is_empty(self): - time_now = self.clock.time_msec() - self.request_times[:] = [ - r for r in self.request_times - if time_now - r < self.window_size - ] - - return not ( - self.ready_request_queue - or self.sleeping_requests - or self.current_processing - or self.request_times - ) - @contextlib.contextmanager def ratelimit(self): # `contextlib.contextmanager` takes a generator and turns it into a diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py index b490bb8725..a100f151d4 100644 --- a/synapse/util/stringutils.py +++ b/synapse/util/stringutils.py @@ -21,10 +21,6 @@ _string_with_symbols = ( ) -def origin_from_ucid(ucid): - return ucid.split("@", 1)[1] - - def random_string(length): return ''.join(random.choice(string.ascii_letters) for _ in xrange(length)) |