From 20f09b56d5675a28e20bae810a54f93e3bf9af73 Mon Sep 17 00:00:00 2001 From: Prodesire Date: Tue, 5 Dec 2017 19:38:31 +0800 Subject: [PATCH] mv ulib and urlparse from request to compat --- pydu/compat.py | 4 ++++ pydu/request.py | 9 +-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pydu/compat.py b/pydu/compat.py index 0444588..21c1d1b 100644 --- a/pydu/compat.py +++ b/pydu/compat.py @@ -6,8 +6,12 @@ PY2 = sys.version_info[0] == 2 # urljoin if PY2: + import urllib as ulib + import urlparse from urlparse import urljoin else: + import urllib.request as ulib + import urllib.parse as urlparse from urllib.parse import urljoin # Dictionary iteration diff --git a/pydu/request.py b/pydu/request.py index b74660a..b4518db 100644 --- a/pydu/request.py +++ b/pydu/request.py @@ -1,16 +1,9 @@ import os import shutil import tempfile -from pydu.compat import PY2, string_types +from pydu.compat import PY2, string_types, urlparse, ulib from pydu.string import safeunicode -if PY2: - import urllib as ulib - import urlparse -else: - import urllib.request as ulib - import urllib.parse as urlparse - class FileName(object): @staticmethod