Typo fix and formatting.

Author: gudrutis

SCRAM/SCRAM/Configuration/ConfigArea.py

@@ -1,23 +1,26 @@
-from os import environ, chmod, getcwd, system
-from os.path import join, exists, isdir, basename, isfile, dirname
-from copy import deepcopy
+from os import environ, chmod, getcwd
+from os.path import join, exists, isdir, basename, dirname
 from sys import stderr, exit
 from subprocess import getstatusoutput as cmd
 from glob import glob
-from Utilities.AddDir import adddir, copydir, copyfile
+from ..Utilities.AddDir import adddir, copydir, copyfile
+
 
 def adddir(dir):
-  cmd("mkdir -p %s" % dir)
+    cmd("mkdir -p %s" % dir)
+
 
 def copydir(src, dest):
-  cmd('cp -Rpf %s %s ' % (src, dest))
+    cmd('cp -Rpf %s %s ' % (src, dest))
+
 
 def copyfile(src, dest):
-  cmd("cp -pf $src $dest");
+    cmd("cp -pf $src $dest");
+
 
 class ConfigArea(object):
     def __init__(self, forcearch=""):
-        self._admindir='.SCRAM'
+        self._admindir = '.SCRAM'
         self._configurationdir = 'config'
         self._forcearch = forcearch
         self._sourcedir = None
@@ -38,14 +41,14 @@ def toolcachename(self):
     def projectcachename(self):
         return join(self.archdir(), 'ProjectCache.db.gz')
 
-    def symlinks(self,links=-1):
-        if links>=0: self._symlinks = links
+    def symlinks(self, links=-1):
+        if links >= 0: self._symlinks = links
         return self._symlinks
 
     def calchksum(self):
         conf = join(self.location(), self.configurationdir(), 'config_tag')
         if exists(conf):
-            tag = open(conf,'r').readline().strip('\n')
+            tag = open(conf, 'r').readline().strip('\n')
             return tag
         return ''
 
@@ -61,25 +64,28 @@ def version(self, version=None):
         if version: self._version = version
         return self._version
 
-    def setup (self, location, areaname=None, symlink=False, localarea = None):
+    def setup(self, location, areaname=None, symlink=False, localarea=None):
         if (not areaname): areaname = self.version()
         self.location
 
     def setup(self, location, areaname=None, symlink=0, locarea=None):
-        if not areaname: areaname=self.version()
+        if not areaname: areaname = self.version()
         self.location(join(location, areaname))
         self.symlinks(symlink)
         if self.configchksum():
-            envfile = join (self.location(), self.admindir(), 'Environment')
+            envfile = join(self.location(), self.admindir(), 'Environment')
             if (not locarea) and exists(envfile):
                 locarea = ConfigArea()
                 locarea.bootstrapfromlocation(self.location())
             if locarea and locarea.configchksum() != self.configchksum():
-                err  = "ERROR: Can not setup your current working area for SCRAM_ARCH: $ENV{SCRAM_ARCH}\n"
-                err += "Your current development area ${location}/${areaname}\n"
-                err += "is using a different ${areaname}/config then the one used for\n"
+                err = "ERROR: Can not setup your current working area for " \
+                      "SCRAM_ARCH: $ENV{SCRAM_ARCH}\n"
+                err += "Your current development area ${location}/${" \
+                       "areaname}\n"
+                err += "is using a different ${areaname}/config then the " \
+                       "one used for\n"
                 err += self.releasetop()
-                print (err, file=stderr)
+                print(err, file=stderr)
                 exit(1)
         adddir(self.archdir())
         return
@@ -106,7 +112,7 @@ def bootstrapfromlocation(self, location):
         self.location(location)
         self._LoadEnvFile()
         return True
-        
+
     def location(self, dir=None):
         if dir:
             self._location = dir
@@ -118,17 +124,18 @@ def location(self, dir=None):
         return self._location
 
     def searchlocation(self, thispath=None):
-        if not thispath: thispath=getcwd()
+        if not thispath: thispath = getcwd()
         while thispath and (thispath != '/') and (thispath != '.'):
             admindir = join(thispath, self.admindir())
             if isdir(admindir): return thispath
-            thispath=dirname(thispath)
+            thispath = dirname(thispath)
         return None
 
     def archname(self, arch=None):
         if arch:
             self._arch = arch
-            if self._location: self.archdir(join(self._location,self._admindir,self._arch))
+            if self._location: self.archdir(
+                join(self._location, self._admindir, self._arch))
         return self._arch
 
     def archdir(self, dir=None):
@@ -151,24 +158,25 @@ def satellite(self, location, areaname=None, symlink=0, locarea=None):
             copydir(relconf, devconf)
         else:
             adddir(join(devconf, 'toolbox'))
-            copydir(join(refconf, 'toolbox', self.arch()), join(devconf, 'toolbox'))
-        adddir(join(sat.location(),sat.sourcedir()))
+            copydir(join(relconf, 'toolbox', self.arch()), join(devconf,
+                                                                'toolbox'))
+        adddir(join(sat.location(), sat.sourcedir()))
         copyfile(self.toolcachename(), sat.archdir())
-        copydir(join(self.archdir(),'timestamps'), sat.archdir())
-        envfile = join(sat.archdir(),'Environment')
+        copydir(join(self.archdir(), 'timestamps'), sat.archdir())
+        envfile = join(sat.archdir(), 'Environment')
         with open(envfile, 'w') as ref:
             ref.write('RELEASETOP=%s\n' % relloc)
-        chkarch = join (sat.archdir(), 'chkarch')
-        ref=open(chkarch, 'w')
+        chkarch = join(sat.archdir(), 'chkarch')
+        ref = open(chkarch, 'w')
         ref.close()
-        envfile = join (sat.location(), sat.admindir(), 'Environment')
+        envfile = join(sat.location(), sat.admindir(), 'Environment')
         if not exists(envfile): sat.save()
         return sat
 
     def copyenv(self, env):
         for e in self.ENV: env[e] = self.ENV[e]
         return
-          
+
     def arch(self):
         return self._arch
 
@@ -183,16 +191,17 @@ def _setAreaArch(self):
             if self._archs is None:
                 self._archs = []
                 for arch in glob(join(toolbox, '*')):
-                    if isdir(join(arch,'tools')):
+                    if isdir(join(arch, 'tools')):
                         arch = basename(arch)
                         self._archs.append(arch)
-            if (not isdir(join(toolbox,self.arch()))) and (len(self._archs)==1): arch = self._archs[0]
+            if (not isdir(join(toolbox, self.arch()))) and (
+                len(self._archs) == 1): arch = self._archs[0]
         if not arch: arch = self.arch
         self.archname(arch)
         return
 
     def _SaveEnvFile(self):
-        envfile = join(self.location(),self.admindir(),'Environment')
+        envfile = join(self.location(), self.admindir(), 'Environment')
         with open(envfile, 'w') as ref:
             ref.write('SCRAM_PROJECTNAME=%s\n' % self.name())
             ref.write('SCRAM_PROJECTVERSION=%s\n' % self.version())
@@ -207,22 +216,27 @@ def _readEnvFile(self, envfile):
         with open(envfile, 'r') as ref:
             for line in [l.strip('\n').strip() for l in ref.readlines()]:
                 if not line or line.startswith('#'): continue
-                (name, value) = line.split('=',1)
-                self.ENV[name]=value
+                (name, value) = line.split('=', 1)
+                self.ENV[name] = value
         return
 
     def _LoadEnvFile(self):
         self.ENV = {}
-        envfile = join(self.location(),self.admindir(),'Environment')
-        self._readEnvFile ( envfile )
-        envfile = join(self.archdir(),'Environment')
-        if exists(envfile):  self._readEnvFile ( envfile )
-        if 'SCRAM_PROJECTNAME'    in self.ENV: self.name(self.ENV['SCRAM_PROJECTNAME'])
-        if 'SCRAM_SYMLINKS'       in self.ENV: self.symlinks(int(self.ENV['SCRAM_SYMLINKS']))
-        if 'SCRAM_CONFIGCHKSUM'   in self.ENV: self.configchksum(self.ENV['SCRAM_CONFIGCHKSUM'])
-        if 'SCRAM_PROJECTVERSION' in self.ENV: self.version(self.ENV['SCRAM_PROJECTVERSION'])
-        if 'SCRAM_CONFIGDIR'      in self.ENV: self.configurationdir(self.ENV['SCRAM_CONFIGDIR'])
-        if 'SCRAM_SOURCEDIR'      in self.ENV: self.sourcedir(self.ENV['SCRAM_SOURCEDIR'])
-        if 'RELEASETOP'           in self.ENV: self.releasetop(self.ENV['RELEASETOP'])
+        envfile = join(self.location(), self.admindir(), 'Environment')
+        self._readEnvFile(envfile)
+        envfile = join(self.archdir(), 'Environment')
+        if exists(envfile):  self._readEnvFile(envfile)
+        if 'SCRAM_PROJECTNAME' in self.ENV: self.name(
+            self.ENV['SCRAM_PROJECTNAME'])
+        if 'SCRAM_SYMLINKS' in self.ENV: self.symlinks(
+            int(self.ENV['SCRAM_SYMLINKS']))
+        if 'SCRAM_CONFIGCHKSUM' in self.ENV: self.configchksum(
+            self.ENV['SCRAM_CONFIGCHKSUM'])
+        if 'SCRAM_PROJECTVERSION' in self.ENV: self.version(
+            self.ENV['SCRAM_PROJECTVERSION'])
+        if 'SCRAM_CONFIGDIR' in self.ENV: self.configurationdir(
+            self.ENV['SCRAM_CONFIGDIR'])
+        if 'SCRAM_SOURCEDIR' in self.ENV: self.sourcedir(
+            self.ENV['SCRAM_SOURCEDIR'])
+        if 'RELEASETOP' in self.ENV: self.releasetop(self.ENV['RELEASETOP'])
         return
-

SCRAM/SCRAM/Core/CMD.py

@@ -2,55 +2,67 @@
 from subprocess import run
 from __main__ import SCRAM_VERSION, SCRAM_BASEPATH
 
+
 def cmd_version(args):
-    print ("%s" % SCRAM_VERSION)
+    print("%s" % SCRAM_VERSION)
     return True
 
+
 def cmd_help(args):
-    run(['man','scram'])
+    run(['man', 'scram'])
     return True;
 
+
 def cmd_arch(args):
-    print ("%s" % os.environ['SCRAM_ARCH'])
+    print("%s" % os.environ['SCRAM_ARCH'])
     return True
 
+
 def spawnversion(newversion='V2_99_99'):
-    os.environ['SCRAM_VERSION']=newversion
-    os.execv(SCRAM_BASEPATH+"/common/scram", sys.argv)
-  
+    os.environ['SCRAM_VERSION'] = newversion
+    os.execv(SCRAM_BASEPATH + "/common/scram", sys.argv)
+
+
 def cmd_unsetenv(args):
     spawnversion()
     return True
 
+
 def cmd_list(args):
     spawnversion()
     return True
 
+
 def cmd_build(args):
     spawnversion()
     return True
 
+
 def cmd_config(args):
     spawnversion()
     return True
 
+
 def cmd_db(args):
     spawnversion()
     return True
 
+
 def cmd_project(args):
     spawnversion()
     return True
 
+
 def cmd_runtime(args):
     spawnversion()
     return True
 
+
 def cmd_setup(args):
     spawnversion()
     return True
 
+
 def cmd_tool(args):
     spawnversion()
     return True
-