Commit 1609d94a authored by Philipp Hörist's avatar Philipp Hörist
Browse files

Merge branch 'urllib' into 'master'

Remove Python 2 compatibility code

See merge request gajim/python-nbxmpp!28
parents 16cb9d5f 4dd65f01
...@@ -32,11 +32,7 @@ import base64 ...@@ -32,11 +32,7 @@ import base64
import sys import sys
import locale import locale
import logging import logging
from urllib.parse import urlparse
from urllib.parse import urlparse
except ImportError:
from urlparse import urlparse
from .plugin import PlugIn from .plugin import PlugIn
from .idlequeue import IdleObject from .idlequeue import IdleObject
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment