Changeset 24226

Timestamp:

10/14/19 23:52:16 (5 years ago)

Author:

bdef

Message:

Fixing some more extraneous spaces

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• GetIds.py (modified) (2 diffs)
• IdFromString.py (modified) (1 diff)
• IdToName.py (modified) (2 diffs)
• runme.py (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/GetIds.py

@@ -1 @@
-#! / usr / bin / env python
+#!/usr/bin/env python
 from IdToName import *
 from IdFromString import *
@@ -62 +62 @@
             # no recognizable ids or id formats
     if np.size(ids) == 0 and not np.all(np.equal(ids_names, None)):
-        raise RuntimeError('runme.py: GetIds.py: include and exclude options (- i / - -    id; - in / - -    include_name; - e / - -    exclude; - en / - -    exclude_name) options must follow GetIds usage format:\n' + GetIds.__doc__)
+        raise RuntimeError('runme.py: GetIds.py: include and exclude options (-i / --id; -in / --include_name; - e / --exclude; - en / --exclude_name) options must follow GetIds usage format:\n' + GetIds.__doc__)
 
     return np.array(ids).astype(int)

issm/trunk-jpl/test/NightlyRun/IdFromString.py

@@ -1 @@
-#! / usr / bin / env python
+#!/usr/bin/env python
 from IdToName import IdToName
 import os

issm/trunk-jpl/test/NightlyRun/IdToName.py

@@ -1 @@
-#! / usr / bin / env python
+#!/usr/bin/env python
 
 
@@ -12 +12 @@
     file_text = infile.readline()
 
-    string = '  #Test Name:'
+    string = '#Test Name:'
     name = file_text[len(string) + 1: - 1]
     return name

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -207 +207 @@
                             fid.write('\n------------------------------------------------------------------    \n')
                             fid.close()
-                            print(('FAILURE difference: N / A test id: {} test name: {} field: {}'.format(id, id_string, fieldname)))
+                            print(('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id, id_string, fieldname)))
                         else:
-                            print(('FAILURE difference: N / A test id: {} test name: {} field: {}'.format(id, id_string, fieldname)))
+                            print(('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id, id_string, fieldname)))
                             raise RuntimeError(message)
 
@@ -218 +218 @@
                 fid = open(os.path.join(ISSM_DIR, 'nightlylog', 'pythonerror.log'), 'a')
                 fid.write('%s' % message)
-                fid.write('\n------------------------------------------------------------------    \n')
+                fid.write('\n------------------------------------------------------------------ \n')
                 fid.close()
-                print(('FAILURE difference: N / A test id: {} test name: {} field: {}'.format(id, id_string, 'N/A')))
+                print(('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id, id_string, 'N/A')))
             else:
-                print(('FAILURE difference: N / A test id: {} test name: {} field: {}'.format(id, id_string, 'N/A')))
+                print(('FAILURE difference: N/A test id: {} test name: {} field: {}'.format(id, id_string, 'N/A')))
                 raise RuntimeError(message)