Merge branch 'urllib' into 'master'

Remove Python 2 compatibility code

See merge request gajim/python-nbxmpp!28

nbxmpp/transports_nb.py

@@ -32,11 +32,7 @@ import base64
 import sys
 import locale
 import logging
-
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
+from urllib.parse import urlparse
 
 from .plugin import PlugIn
 from .idlequeue import IdleObject