maemo scratchbox support: survive missing doctest module and site._Helper

IPython/iplib.py

@@ -702,7 +702,10 b' class InteractiveShell(object,Magic):'
 
         # Do a proper resetting of doctest, including the necessary displayhook
         # monkeypatching
-        doctest_reload()
+        try:
+            doctest_reload()
+        except ImportError:
+            warn("doctest module does not exist.")
         
         # Set user colors (don't do it in the constructor above so that it
         # doesn't crash if colors option is invalid)

IPython/ipmaker.py

@@ -103,9 +103,12 b' def make_IPython(argv=None,user_ns=None,user_global_ns=None,debug=1,'
                      embedded=embedded,**kw)
 
     # Put 'help' in the user namespace
-    from site import _Helper
+    try:
+        from site import _Helper
+        IP.user_ns['help'] = _Helper()
+    except ImportError:
+        warn('help() not available - check site.py')
     IP.user_config_ns = {}
-    IP.user_ns['help'] = _Helper()
 
 
     if DEVDEBUG:

doc/ChangeLog

@@ -1,3 +1,8 b''
[phone]  Ville Vainio <[e-mail]>
+
+	* iplib.py, ipmaker.py: survive lack of doctest and site._Helper
+	for minimal environments (e.g. Maemo sdk python)
+
 2008-05-14  Ville Vainio <[e-mail]>
 
 	* Extensions/ipy_greedycompleter.py: