Changeset 96c9cf1 in sasview for src/sas/sascalc/dataloader/file_reader_base_class.py

Timestamp:

Nov 2, 2017 9:04:32 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

08b9e331, 90961b4

Parents:

8e5c36d (diff), 20fa5fe (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.

git-author:

Paul Kienzle <pkienzle@…> (11/02/17 09:04:32)

git-committer:

GitHub <noreply@…> (11/02/17 09:04:32)

Message:

Merge pull request #121 from llimeht/tmp/spelling

Fix typo in P(r) peaks description

File:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (2 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -123 +123 @@
         """
         Generic error handler to add an error to the current datainfo to
-        propogate the error up the error chain.
+        propagate the error up the error chain.
         :param msg: Error message
         """
@@ -325 +325 @@
     def splitline(line):
         """
-        Splits a line into pieces based on common delimeters
+        Splits a line into pieces based on common delimiters
         :param line: A single line of text
         :return: list of values