From 1f400e40200b43ce578795e67ed535e7b9a7a08f Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Mon, 10 Sep 2018 00:57:04 +0200
Subject: [PATCH] Fix Python 3.7 support, and run Travis tests on 3.7.

Travis' "nightly" python is actually older than 3.7.0 (3.7.0a4+)
---
 .travis.yml         | 2 +-
 plugins/__init__.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 55380ebe8..3f96d9311 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-  - "nightly"
+  - "3.7-dev"
   - "pypy"
   - "pypy-5.3.1" # default pypy3 doesn't work, see https://bitbucket.org/pypy/pypy/issues/2129/local-variable-val-referenced-before
 env:
diff --git a/plugins/__init__.py b/plugins/__init__.py
index ac81862fa..284934bbf 100644
--- a/plugins/__init__.py
+++ b/plugins/__init__.py
@@ -196,7 +196,6 @@ class ChannelUserDictionary(collections.MutableMapping):
         for channel, ids in self.channels.items():
             for id_, value in ids.items():
                 yield (channel, id_)
-        raise StopIteration()
 
     def __len__(self):
         return sum([len(x) for x in self.channels])