Changeset 2621 for trunk/python

Timestamp:

08/06/12 12:15:11 (12 years ago)

Author:

Malte Marquarding

Message:

allow for ipython >=0.10 (both 0.10 and 0.11)

File:

• trunk/python/env.py (modified) (1 diff)

trunk/python/env.py

@@ -53 +53 @@
 
     # set up user space
-#     userdir = os.environ["HOME"]+"/.asap"
-#     if not os.path.exists(userdir):
-#         print 'First time ASAP use. Setting up ~/.asap'
-#         os.makedirs(os.path.join(userdir, "profile_default"))
-#         if not is_casapy():
-#             shutil.copyfile(asapdata+"/data/ipy_user_conf.py",
-#                             userdir+"/ipy_user_conf.py")
-#             shutil.copyfile(asapdata+"/data/ipython_config.py",
-#                             userdir+"/profile_default/ipython_config.py")
-#         f = file(userdir+"/asapuserfuncs.py", "w")
-#         f.close()
-#         f = file(userdir+"/ipythonrc", "w")
-#         f.close()
-#     else:
-#         if not is_casapy():
-#             # upgrade to support later ipython versions
+    if os.environ["USER"] == 'root':
+        return
+    try:
+        import IPython
+          # 0.11+ doesn't use user dir
+        if int(IPython.__version__.split(".")[1]) >= 11:
+            return
+    except:
+        # no ipython so we don't need user dir
+        return
+    userdir = os.environ["HOME"]+"/.asap"
+    if not os.path.exists(userdir):
+        print 'First time ASAP use. Setting up ~/.asap'
+#        os.makedirs(os.path.join(userdir, "profile_default"))
+        if not is_casapy():
+            shutil.copyfile(asapdata+"/data/ipy_user_conf.py",
+                            userdir+"/ipy_user_conf.py")
+#            shutil.copyfile(asapdata+"/data/ipython_config.py",
+#                            userdir+"/profile_default/ipython_config.py")
+        f = file(userdir+"/asapuserfuncs.py", "w")
+        f.close()
+        f = file(userdir+"/ipythonrc", "w")
+        f.close()
+    else:
+        if not is_casapy():
+            # upgrade to support later ipython versions
             
-#             if not os.path.exists(userdir+"/ipy_user_conf.py"):
-#                shutil.copyfile(asapdata+"/data/ipy_user_conf.py",
-#                                userdir+"/ipy_user_conf.py")
+             if not os.path.exists(userdir+"/ipy_user_conf.py"):
+                shutil.copyfile(asapdata+"/data/ipy_user_conf.py",
+                                userdir+"/ipy_user_conf.py")
 #             if not os.path.exists(userdir+"/profile_default/ipython_config.py"):
 #                shutil.copyfile(asapdata+"/data/ipython_config.py",