yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2971
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Mon 2011-11-28 07:40:50 +0100
message:
  Make the code workable with ipython 0.11
modified:
  core/main/main.py.in


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'core/main/main.py.in'
--- core/main/main.py.in	2011-05-18 16:32:51 +0000
+++ core/main/main.py.in	2011-11-28 06:40:50 +0000
@@ -218,7 +218,7 @@
 		import IPython.ipapi
 		IPython.ipapi.get().IP.atexit_operations()
 	elif yade.runtime.ipython_version==11:
-		from IPython.core.embed import InteractiveShellEmbed
+		from IPython.frontend.terminal.embed import InteractiveShellEmbed
 		# use the dict to set attributes
 		for k in ipconfig: setattr(InteractiveShellEmbed,k,ipconfig[k])
 		InteractiveShellEmbed.banner1=banner # called banner1 here, not banner anymore
@@ -263,5 +263,6 @@
 	qapp=QtGui.QApplication(sys.argv)
 	userSession(qt4=True,qapp=qapp)
 
-O.exitNoBacktrace()
+if yade.runtime.ipython_version==10:
+	O.exitNoBacktrace()