From 3f79fc64d3ec05099ab08efd73798ffc6294faf6 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Tue, 10 Feb 2015 11:36:13 +0800
Subject: [PATCH] upip: Prepare to support standalone dependency modules for
 upip.

---
 upip/upip.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/upip/upip.py b/upip/upip.py
index aae22ecd..1d0530b4 100644
--- a/upip/upip.py
+++ b/upip/upip.py
@@ -1,16 +1,22 @@
-import sys
-import os
-import os.path
-import errno
-import gzip
+def upip_import(mod):
+    try:
+        return __import__("upip_" + mod)
+    except ImportError:
+        return __import__(mod)
+
+sys = upip_import("sys")
+os = upip_import("os")
+os.path = upip_import("os.path").path
+errno = upip_import("errno")
+gzip = upip_import("gzip")
 try:
-    import utarfile as tarfile
+    tarfile = upip_import("utarfile")
 except ImportError:
-    import tarfile
+    tarfile = upip_import("tarfile")
 try:
-    import ujson as json
+    json = upip_import("ujson")
 except ImportError:
-    import json
+    json = upip_import("json")
 
 
 DEFAULT_MICROPYPATH = "~/.micropython/lib:/usr/lib/micropython"