commit 0fd2ac7ede3d7c8602a0a71fe1dc1678773baee4
Author: Andreas Roehler <andreas.roehler@online.de>
Date:   Fri Feb 22 09:08:28 2013 +0100

    Depend default python-mode from existing feature
    
    The former
    
    (if (featurep 'xemacs) 'python-mode 'python)
    
    makes a wrong assumption, as python-mode.el provides 'python-mode
    which does not depend from use of XEmacs
    
    python-mode.el should provide a defcustom still to choose environment
    
    TINYCHANGE

diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index 02d762c..c9118e9 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -43,7 +43,7 @@
 (defvar org-babel-python-command "python"
   "Name of the command for executing Python code.")
 
-(defvar org-babel-python-mode (if (featurep 'xemacs) 'python-mode 'python)
+(defvar org-babel-python-mode (if (or (featurep 'python-mode)(featurep 'xemacs)) 'python-mode 'python)
   "Preferred python mode for use in running python interactively.
 This will typically be either 'python or 'python-mode.")