[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [craft] bin: Don't use a custome CaseInsensitive dict but just the os._Environ
From:       Hannah von Reth <null () kde ! org>
Date:       2017-06-30 16:50:04
Message-ID: E1dQz7M-0001Nu-F6 () code ! kde ! org
[Download RAW message or body]

Git commit 07715dfae4cd1aa79cb703d3548825bd31e24154 by Hannah von Reth.
Committed on 30/06/2017 at 16:49.
Pushed by vonreth into branch 'master'.

Don't use a custome CaseInsensitive dict but just the os._Environ

M  +2    -31   bin/CraftSetupHelper.py
M  +3    -2    bin/craft.py

https://commits.kde.org/craft/07715dfae4cd1aa79cb703d3548825bd31e24154

diff --git a/bin/CraftSetupHelper.py b/bin/CraftSetupHelper.py
index 786530507..5ab536f23 100644
--- a/bin/CraftSetupHelper.py
+++ b/bin/CraftSetupHelper.py
@@ -24,33 +24,6 @@ if sys.version_info[ 0:3 ] < MIN_PY_VERSION:
     print( "Please install it and adapt your kdesettings.ini", file= sys.stderr )
     exit( 1 )
 
-# based on http://stackoverflow.com/a/30221547
-class CaseInsensitiveKey(object):
-    def __init__(self, key):
-        self.key = key
-
-    def __hash__(self):
-        return hash(self.key.lower())
-
-    def __eq__(self, other):
-        return self.key.lower() == other.key.lower()
-
-    def __str__(self):
-        return self.key
-
-
-class CaseInsensitiveDict(dict):
-    def __setitem__(self, key, value):
-        key = CaseInsensitiveKey(key)
-        super(CaseInsensitiveDict, self).__setitem__(key, value)
-
-    def __getitem__(self, key):
-        key = CaseInsensitiveKey(key)
-        return super(CaseInsensitiveDict, self).__getitem__(key)
-
-    def __contains__(self, item):
-        return super(CaseInsensitiveDict, self).__contains__(CaseInsensitiveKey(item))
-
 class SetupHelper( object ):
     def __init__(self, args=None):
         self.args = args
@@ -153,7 +126,7 @@ class SetupHelper( object ):
         self.env[ key ] = os.path.pathsep.join( var )
 
     def stringToEnv( self, string ):
-        out = CaseInsensitiveDict( )
+        out = os.environ.copy()
         for line in string.split( "\n" ):
             key, value = line.strip( ).split( "=", 1 )
             out[ key ] = value
@@ -187,9 +160,7 @@ class SetupHelper( object ):
                 print( "Failed to setup intel compiler", file = sys.stderr )
                 exit(1)
             return self.stringToEnv( result )
-        out = CaseInsensitiveDict()
-        for k, v in os.environ.items():
-            out[k] = v
+        out = os.environ.copy()
         return out
 
 
diff --git a/bin/craft.py b/bin/craft.py
index 31e4f8456..5dbb38bdf 100755
--- a/bin/craft.py
+++ b/bin/craft.py
@@ -35,8 +35,9 @@ if not "KDEROOT" in os.environ:
     helper = CraftSetupHelper.SetupHelper()
     helper.setupEnvironment()
     # apply to own env
-    for key, val in helper.env.items():
-        os.environ[str(key)] = val
+    os.environ = helper.env
+    helper.printBanner()
+
 
 
 def destroyCraftRoot():
[prev in list] [next in list] [prev in thread] [next in thread]