summaryrefslogtreecommitdiff
path: root/python/helpers/pydev/pydev_imports.py
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-09-04 13:24:04 -0700
committerTor Norbye <tnorbye@google.com>2014-09-04 13:24:04 -0700
commitc3d3a90f6b4ead083d63e28e6b9fcea93d675678 (patch)
treefc0dcd722b6d445468dbe7dad13b4c11781b1cbe /python/helpers/pydev/pydev_imports.py
parent1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff)
downloadidea-c3d3a90f6b4ead083d63e28e6b9fcea93d675678.tar.gz
Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git
Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd
Diffstat (limited to 'python/helpers/pydev/pydev_imports.py')
-rw-r--r--python/helpers/pydev/pydev_imports.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/helpers/pydev/pydev_imports.py b/python/helpers/pydev/pydev_imports.py
index 69804a871eaf..c5132cffbfe3 100644
--- a/python/helpers/pydev/pydev_imports.py
+++ b/python/helpers/pydev/pydev_imports.py
@@ -53,9 +53,9 @@ except:
from pydevd_exec2 import Exec
try:
- from urllib import quote
+ from urllib import quote, quote_plus, unquote_plus
except:
- from urllib.parse import quote #@UnresolvedImport
+ from urllib.parse import quote, quote_plus, unquote_plus #@UnresolvedImport
import os