Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make test fails on python3.5 with error ImportError: No module named urlparse #654

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/disco/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def force_ascii(string):

import socketserver as socket_server
from urllib.parse import urlencode
from urllib.parse import urlparse
import http.client as httplib
import http.server as http_server

Expand Down Expand Up @@ -76,6 +77,7 @@ def force_ascii(string):

import SocketServer as socket_server
from urllib import urlencode
from urlparse import urlparse
import httplib as httplib
import BaseHTTPServer as http_server

Expand Down
1 change: 0 additions & 1 deletion lib/disco/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"""
import os, sys, time
import functools, gzip
from urlparse import urlparse

from disco.compat import BytesIO, basestring, bytes_to_str, str_to_bytes
from disco.compat import pickle_loads, pickle_dumps, sort_cmd
Expand Down