[pypy-commit] pypy builtin-module: Fixes.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: builtin-module
Changeset: r50119:c29aab975e44
Date: 2011-12-04 11:32 +0100
http://bitbucket.org/pypy/pypy/changeset/c29aab975e44/

Log:	Fixes.

diff --git a/lib_pypy/_multibytecodec.py b/lib_pypy/_multibytecodec.py
--- a/lib_pypy/_multibytecodec.py
+++ b/lib_pypy/_multibytecodec.py
@@ -1,3 +1,4 @@
 # indirection needed; otherwise the built-in module "_multibytecodec" shadows
 # any file _multibytecodec.py that would be found in the user dirs
 from __builtin__multibytecodec import *
+from __builtin__multibytecodec import __getcodec
diff --git a/pypy/module/_multibytecodec/app_multibytecodec.py b/pypy/module/_multibytecodec/app_multibytecodec.py
--- a/pypy/module/_multibytecodec/app_multibytecodec.py
+++ b/pypy/module/_multibytecodec/app_multibytecodec.py
@@ -2,8 +2,8 @@
 #
 # The interface here may be a little bit on the lightweight side.
 
-from _multibytecodec import MultibyteIncrementalDecoder
-from _multibytecodec import MultibyteIncrementalEncoder
+from __builtin__multibytecodec import MultibyteIncrementalDecoder
+from __builtin__multibytecodec import MultibyteIncrementalEncoder
 
 
 class MultibyteStreamReader(MultibyteIncrementalDecoder):