merge 3.5
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Mon, 14 Sep 2009 11:38:30 +0200
branch3.5
changeset 3203 1366cacd5387
parent 3200 747d17498cca (current diff)
parent 3202 241ae91e9ab7 (diff)
child 3208 11b84e3b9458
child 3209 c2c8f88a4520
merge
--- a/common/i18n.py	Mon Sep 14 11:32:07 2009 +0200
+++ b/common/i18n.py	Mon Sep 14 11:38:30 2009 +0200
@@ -45,7 +45,7 @@
     """
     print cmd.replace(os.getcwd() + os.sep, '')
     from subprocess import call
-    status = call(cmd)
+    status = call(cmd, shell=True)
     if status != 0:
         raise Exception('status = %s' % status)
 
--- a/common/migration.py	Mon Sep 14 11:32:07 2009 +0200
+++ b/common/migration.py	Mon Sep 14 11:38:30 2009 +0200
@@ -228,7 +228,10 @@
         else:
             readline.set_completer(Completer(local_ctx).complete)
             readline.parse_and_bind('tab: complete')
-            histfile = os.path.join(os.environ["HOME"], ".eshellhist")
+            home_key = 'HOME'
+            if sys.platform == 'win32':
+                home_key = 'USERPROFILE'
+            histfile = os.path.join(os.environ[home_key], ".eshellhist")
             try:
                 readline.read_history_file(histfile)
             except IOError: