diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-07-19 11:26:04 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-19 11:26:04 +0100 |
| commit | be3adfc331ef7f19b2e44b17cd06e463bff09f3a (patch) | |
| tree | 2e565f68ef2154e3882704916eae3b1e8f0c9f3c /tests/appservice/test_appservice.py | |
| parent | Merge branch 'develop' into matthew/filter_members (diff) | |
| parent | revert 00bc979 (diff) | |
| download | synapse-be3adfc331ef7f19b2e44b17cd06e463bff09f3a.tar.xz | |
merge develop pydoc for _get_state_for_groups
Diffstat (limited to 'tests/appservice/test_appservice.py')
| -rw-r--r-- | tests/appservice/test_appservice.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/appservice/test_appservice.py b/tests/appservice/test_appservice.py index 5b2b95860a..891e0cc973 100644 --- a/tests/appservice/test_appservice.py +++ b/tests/appservice/test_appservice.py @@ -12,14 +12,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from synapse.appservice import ApplicationService +import re + +from mock import Mock from twisted.internet import defer -from mock import Mock -from tests import unittest +from synapse.appservice import ApplicationService -import re +from tests import unittest def _regex(regex, exclusive=True): |