From e67ddd41f832fd1f5f672c9538ac719ef1525a54 Mon Sep 17 00:00:00 2001 From: Carl Simon Adorf Date: Sun, 19 May 2019 10:23:17 -0400 Subject: [PATCH] Fix Py27 incompatibility. --- signac/contrib/filterparse.py | 2 +- signac/contrib/project.py | 2 +- signac/uri.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/signac/contrib/filterparse.py b/signac/contrib/filterparse.py index af3b79f8e..4fffff920 100644 --- a/signac/contrib/filterparse.py +++ b/signac/contrib/filterparse.py @@ -3,10 +3,10 @@ # This software is licensed under the BSD 3-Clause License. from __future__ import print_function import sys -from urllib.parse import urlencode from ..core import json from ..common import six +from ..common.six.moves.urllib.parse import urlencode if six.PY2: from collections import Mapping, Iterable else: diff --git a/signac/contrib/project.py b/signac/contrib/project.py index a8325c358..69f4ce49c 100644 --- a/signac/contrib/project.py +++ b/signac/contrib/project.py @@ -14,7 +14,6 @@ from contextlib import contextmanager from itertools import groupby from multiprocessing.pool import ThreadPool -from urllib.parse import urlparse from .. import syncutil from ..core import json @@ -37,6 +36,7 @@ from .filterparse import parse_filter from .filterparse import urlencode_filter from .filterparse import _parse_filter_query +from six.moves.urllib.parse import urlparse if six.PY2: from collections import Mapping, Iterable else: diff --git a/signac/uri.py b/signac/uri.py index 7ffc4dc16..688bfbcc8 100644 --- a/signac/uri.py +++ b/signac/uri.py @@ -3,9 +3,9 @@ # This software is licensed under the BSD 3-Clause License. import os import re -from urllib.parse import urlparse, urlunparse from .contrib.project import Project +from .common.six.moves.urllib.parse import urlparse, urlunparse _PATH_SCHEMA = r'(?P.*?)(\/api\/v(?P\d+)(?P.*))'