Merge pull request #12 from gjbex/sourcery/development

Sourcery refactored development branch

Author: gjbex

source-code/code-evaluation/fac.py

@@ -1,5 +1,2 @@
 def fac(n):
-    if n < 2:
-        return 1
-    else:
-        return n*fac(n-1)
+    return 1 if n < 2 else n*fac(n-1)

source-code/code-evaluation/fib.py

@@ -1,5 +1,2 @@
 def fib(n):
-    if n == 0 or n == 1:
-        return 1
-    else:
-        return fib(n-1) + fib(n-2)
+    return 1 if n in [0, 1] else fib(n-1) + fib(n-2)

source-code/command-line-arguments/ArgParse/partial_parse.py

@@ -19,5 +19,5 @@
                                         options.resoure_specs))
         print('resources: ' + ', '.join(specs))
     if options.account:
-        print('account: ' + options.account)
+        print(f'account: {options.account}')
     print('unparsed: ' + ', '.join(unparsed))

source-code/command-line-arguments/ArgParse/two_stage_parse.py

@@ -7,7 +7,7 @@
 
 
 def parse_job_script(file_name):
-    args = list()
+    args = []
     with open(file_name) as file:
         for line in file:
             if line.lstrip().startswith('#PBS '):

source-code/command-line-arguments/Fire/sayer.py

@@ -12,13 +12,12 @@ def __init__(self, name):
         self.name = name
 
     def to(self, name=None):
-        if name is None:
-            if self.name is None:
-                return 'No one to say hello to'
-            else:
-                return f'Hello to {self.name}'
-        else:
+        if name is not None:
             return f'Hello {name}'
+        if self.name is None:
+            return 'No one to say hello to'
+        else:
+            return f'Hello to {self.name}'
 
     def everyone(self):
         return 'hello to everyone'
@@ -34,15 +33,12 @@ def __init__(self, name):
 
     def to(self, name=None):
         if name is None:
-            if self.name is None:
-                return 'No one to say bye to'
-            else:
-                return f'Bye to {self.name}'
+            return 'No one to say bye to' if self.name is None else f'Bye to {self.name}'
         else:
             return f'Bye {name}'
 
     def no_one(self):
-        return f'Bye to no one'
+        return 'Bye to no one'
 
 
 class Sayer:

source-code/config-parser/config_reader.py

@@ -5,10 +5,7 @@
 
 
 def main():
-    if len(sys.argv) > 1:
-        cfg_file = sys.argv[1]
-    else:
-        cfg_file = 'defaults.conf'
+    cfg_file = sys.argv[1] if len(sys.argv) > 1 else 'defaults.conf'
     cfg_parser = SafeConfigParser()
     cfg_parser.read(cfg_file)
     print('Sections:')

source-code/data-formats/Vcd/vcd_parser.py

@@ -15,7 +15,7 @@ def parse_config_line(meta_data, line):
         meta_data[symbol] = demangle_name(name)
 
 def parse_config(vcd_file):
-    meta_data = dict()
+    meta_data = {}
     for line in vcd_file:
         line = line.strip()
         if line == '$end':
@@ -37,16 +37,15 @@ def update_buffer(buffer, line, meta_data):
     buffer[key] = value
 
 def init_data(meta_data):
-    data = dict()
-    data['time'] = list()
+    data = {'time': []}
     for var in meta_data:
-        data[meta_data[var]] = list()
+        data[meta_data[var]] = []
     return data
 
 def parse_data(vcd_file, meta_data):
     data = init_data(meta_data)
     time_stamp = None
-    buffer = dict()
+    buffer = {}
     for line in vcd_file:
         line = line.strip()
         if line.startswith('#'):
@@ -68,9 +67,7 @@ def write_vcd_data_structure(out_file, data, sep=' '):
     columns = list(data.keys())
     out_file.write(sep.join(columns) + '\n')
     for time_step in range(len(data['time'])):
-        data_line = list()
-        for var in columns:
-            data_line.append(data[var][time_step])
+        data_line = [data[var][time_step] for var in columns]
         out_file.write(sep.join(str(data_item) for data_item in data_line))
         out_file.write('\n')
 

source-code/data-formats/agt_parser.py

@@ -106,7 +106,7 @@ def _parse_data(self, agt_file):
         if not match:
             msg = "line {0:d}: invalid number of measurements '{1}'"
             raise AgtDataError(msg.format(self._current_line, nr_lines_str))
-        nr_lines = int(match.group(1))
+        nr_lines = int(match[1])
         self._current_line += 1
 # ignore header line
         agt_file.readline()

source-code/data-formats/data_generator.py

@@ -47,11 +47,10 @@ def __iter__(self):
         return self
 
     def __next__(self):
-        if self._current < self.n:
-            self._current += 1
-            return self._distr(*self._params)
-        else:
+        if self._current >= self.n:
             raise StopIteration()
+        self._current += 1
+        return self._distr(*self._params)
 
 
 class DistributionCreator(object):
@@ -108,9 +107,9 @@ def __init__(self, file_name, table_name, col_defs):
         self._row = self._table.row
 
     def _create_table(self, table_name, col_defs):
-        description = {}
-        for col_def in col_defs:
-            description[col_def['name']] = self._typemap[col_def['type']]
+        description = {
+            col_def['name']: self._typemap[col_def['type']] for col_def in col_defs
+        }
         return self._file.create_table('/', table_name, description)
 
     def set_headers(self, headers):

source-code/data-formats/read_csv.py

@@ -21,7 +21,7 @@ def main():
             print('{name} --- {weight}'.format(name=row['name'],
                                                weight=row['weight']))
             sum += float(row['weight'])
-        print('sum = {}'.format(sum))
+        print(f'sum = {sum}')
 
 if __name__ == '__main__':
     main()