Merge pull request #3108 from NotAFile/py3-six-urlparse

Use six.moves.urlparse
This commit is contained in:
Richard van der Hoff 2018-04-30 00:33:05 +01:00 committed by GitHub
commit 9e2601f830
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 21 deletions

View file

@ -41,8 +41,7 @@ import logging
import random
import sys
import urllib
import urlparse
from six.moves.urllib import parse as urlparse
logger = logging.getLogger(__name__)
outbound_logger = logging.getLogger("synapse.http.outbound")