Changeset cb44d66 in sasview for src/sas/sascalc/fit/pagestate.py
- Timestamp:
- Mar 6, 2019 6:18:51 PM (5 years ago)
- Branches:
- ticket-1094-headless
- Children:
- f0b9bce
- Parents:
- ffbf35ee (diff), f205d3a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/fit/pagestate.py
r1dc134e6 rcb44d66 777 777 #Truncating string so print doesn't complain of being outside margins 778 778 if sys.platform != "win32": 779 MAX_STRING_LENG HT= 50780 if len(file_value) > MAX_STRING_LENG HT:781 file_value = "File name:.."+file_value[-MAX_STRING_LENG HT+10:]779 MAX_STRING_LENGTH = 50 780 if len(file_value) > MAX_STRING_LENGTH: 781 file_value = "File name:.."+file_value[-MAX_STRING_LENGTH+10:] 782 782 file_name = CENTRE % file_value 783 783 if len(title) == 0: … … 1032 1032 doc_model = newdoc.createElement('model_list_item') 1033 1033 doc_model.setAttribute('checked', str(model[0].GetValue())) 1034 keys = model[1].keys()1034 keys = list(model[1].keys()) 1035 1035 doc_model.setAttribute('name', str(keys[0])) 1036 1036 values = model[1].get(keys[0]) … … 1091 1091 if node.get('version'): 1092 1092 # Get the version for model conversion purposes 1093 x = re.sub( '[^\d.]', '', node.get('version'))1093 x = re.sub(r'[^\d.]', '', node.get('version')) 1094 1094 self.version = tuple(int(e) for e in str.split(x, ".")) 1095 1095 # The tuple must be at least 3 items long … … 1111 1111 try: 1112 1112 self.timestamp = float(entry.get('epoch')) 1113 except Exception :1113 except Exception as exc: 1114 1114 msg = "PageState.fromXML: Could not" 1115 msg += " read timestamp\n %s" % sys.exc_value1115 msg += " read timestamp\n %s" % exc 1116 1116 logger.error(msg) 1117 1117 … … 1409 1409 if isinstance(data.run_name, dict): 1410 1410 # Note: key order in dict is not guaranteed, so sort 1411 name = data.run_name.keys()[0]1411 name = list(data.run_name.keys())[0] 1412 1412 else: 1413 1413 name = data.run_name
Note: See TracChangeset
for help on using the changeset viewer.