fixing some errors from codacity checks for pull request

Author: jcasalsatpic

apel/db/records/htcondorce.py

@@ -20,23 +20,22 @@ class HTCondorCERecord(Record):
     """
     Class to represent a record from BLAHP systems
     """
-    
+
     def __init__(self):
         '''
         Initializer for BlahdRecord
         '''
-        
+
         Record.__init__(self)
-        
+
         self._mandatory_fields = []
-        
+
         self._db_fields = ["TimeStamp", "GlobalUserName", "FQAN",
                         "VO", "VOGroup", "VORole", "CE", "GlobalJobId", "LrmsId",
                         "Site", "ValidFrom", "ValidUntil", "Processed"]
-        
+
         self._int_fields = ["Processed"]
-        
+
         self._all_fields = self._db_fields
-        
-        self._datetime_fields = ["TimeStamp", "ValidFrom", "ValidUntil"]
-        
+
+        self._datetime_fields = ["TimeStamp", "ValidFrom", "ValidUntil"]

apel/parsers/htcondor.py

@@ -47,7 +47,8 @@ def parse(self, line):
             'JobName'       : lambda x: x['clusterid'] + "_" + self.machine_name,
             'LocalUserID'   : lambda x: x['owner'],
             'LocalUserGroup': lambda x: x['VO'],
-            'WallDuration'  : lambda x: float(x['cputmult'])*(float(x['walltime+suspensiontime'])-float(x['suspensiontime'])),
+            'WallDuration'  : lambda x: float(x['cputmult'])*
+              (float(x['walltime+suspensiontime'])-float(x['suspensiontime'])),
             'CpuDuration'   : lambda x: float(x['cputmult'])*(float(x['cputime'])+float(x['syscputime'])),
             'StartTime'     : lambda x: int(x['startdate']),
             'StopTime'      : lambda x: int(x['enddate']),

apel/parsers/htcondorce.py

@@ -12,11 +12,10 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-   
+
 A parser for HTCondorCE record file.
-I've used a regular expression here. Maybe import csv would be better?
 
-    @author: Konrad Jopek
+    @author: Jordi Casals modified Blahd from Konrad Jopek
 '''
 
 from apel.db.records.htcondorce import HTCondorCERecord
@@ -33,10 +32,15 @@ class HTCondorCEParser(Parser):
     def parse(self, line):
         '''
         Parses single line from accounting log file.
-        
+
         Example line of accounting log file:
-        "timestamp=2017-02-01 00:03:49; clusterid=381620; CE_JobId=396933.0; owner=lhpilot007; VO=lhcb; userDN=/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=romanov/CN=427293/CN=Vladimir Romanovskiy; userFQAN=/lhcb/Role=pilot/Capability=NULL; [email protected]; request_cpus=1; cputime=3466.000000; syscputime=259.000000; jobduration=4821.575215; walltime+suspensiontime=4823.000000; suspensiontime=0.000000; cputmult=1.1864; pmem=1684532; vmem=944; disk=38543; ExitCode=0; ExitSignal=undefined; LastStatus=4; JobStatus=3; startdate=1485899007; enddate=1485903829"
-        
+        "timestamp=2017-02-01 00:03:49; clusterid=381620; CE_JobId=396933.0; owner=lhpilot007; VO=lhcb; 
+        userDN=/DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=romanov/CN=427293/CN=Vladimir Romanovskiy; 
+        userFQAN=/lhcb/Role=pilot/Capability=NULL; [email protected]; request_cpus=1; 
+        cputime=3466.000000; syscputime=259.000000; jobduration=4821.575215; walltime+suspensiontime=4823.000000; 
+        suspensiontime=0.000000; cputmult=1.1864; pmem=1684532; vmem=944; disk=38543; ExitCode=0; 
+        ExitSignal=undefined; LastStatus=4; JobStatus=3; startdate=1485899007; enddate=1485903829"
+
         Line was split, if you want to rejoin use ' ' as a joiner.
         '''
         data = {}
@@ -48,15 +52,14 @@ def parse(self, line):
         for item in line.split("; ") :
             key, value = item.split('=', 1)
             data[key] = value
-            
+
         mapping = {
             'TimeStamp'      : lambda x: 'T'.join(x['timestamp'].split()) + 'Z',
             'GlobalUserName' : lambda x: x['userDN'],
             'FQAN'           : lambda x: x['userFQAN'],
             'VO'             : lambda x: x['VO'],
             'VOGroup'        : lambda x: x['userFQAN'].split("/")[1],
             'VORole'         : lambda x: x['userFQAN'].split("/")[2],
-#            'CE'             : lambda x: self.machine_name,
             'CE'             : lambda x: self.machine_name + ":" + "9619" + "/" + self.machine_name + "-" + "condor",
             'GlobalJobId'    : lambda x: x['CE_JobId'] + "_" + self.machine_name,
             'LrmsId'         : lambda x: x['clusterid'] + "_" + self.machine_name,
@@ -77,5 +80,4 @@ def parse(self, line):
 
         record = HTCondorCERecord()
         record.set_all(rc)
-        return record
-    
+        return record