From 7aa21f75c1d9ac36f1ab7e00aa9d0048ef61476d Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 15 Mar 2009 00:53:05 +0000
Subject: A few more docstring/API cleanups for importlib.

---
 Lib/importlib/__init__.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'Lib/importlib/__init__.py')

diff --git a/Lib/importlib/__init__.py b/Lib/importlib/__init__.py
index 7474350f88..37577ff41d 100644
--- a/Lib/importlib/__init__.py
+++ b/Lib/importlib/__init__.py
@@ -26,20 +26,6 @@ import os
 import re
 import tokenize
 
-# XXX Temporary functions that should eventually be removed.
-def _set__import__():
-    """Set __import__ to an instance of Import."""
-    global original__import__
-    original__import__ = __import__
-    __builtins__['__import__'] = _bootstrap._import
-
-
-def _reset__import__():
-    """Set __import__ back to the original implementation (assumes
-    _set__import__ was called previously)."""
-    __builtins__['__import__'] = original__import__
-
-
 # Bootstrap help #####################################################
 
 def _case_ok(directory, check):
@@ -116,7 +102,7 @@ marshal._r_long = _r_long
 
 # Public API #########################################################
 
-__import__ = _bootstrap._import
+from ._bootstrap import __import__
 
 
 def import_module(name, package=None):
-- 
cgit v1.2.1