From 212ed62b19eaa4a4b1bcf817d278525afaac20c5 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 2 Nov 2020 12:07:16 +0100 Subject: [PATCH] pytest-based tests removed unused functionality from deprecated python library modules --- PRIVATE | 2 +- python/damask/_asciitable.py | 35 ----------------------------------- python/damask/_test.py | 6 ------ 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/PRIVATE b/PRIVATE index e2301f7d1..5a948aff8 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit e2301f7d12ff0ae12218d9b58e33a814eb5431c9 +Subproject commit 5a948aff84c1e117dd0107185223622c5832bf61 diff --git a/python/damask/_asciitable.py b/python/damask/_asciitable.py index 9d762369a..de7596aea 100644 --- a/python/damask/_asciitable.py +++ b/python/damask/_asciitable.py @@ -385,38 +385,3 @@ class ASCIItable(): self.data = np.loadtxt(self.__IO__['in'],usecols=use,ndmin=2) return labels_missing - -# ------------------------------------------------------------------ - def data_write(self): - """Write current data array and report alive output back.""" - if len(self.data) == 0: return True - - if isinstance(self.data[0],list): - return self.output_write(['\t'.join(map(self._quote,items)) for items in self.data]) - else: - return self.output_write( '\t'.join(map(self._quote,self.data))) - -# ------------------------------------------------------------------ - def data_writeArray(self): - """Write whole numpy array data.""" - for row in self.data: - try: - output = list(map(repr,row)) - except Exception: - output = [repr(row)] - - try: - self.__IO__['out'].write('\t'.join(output) + '\n') - except Exception: - pass - -# ------------------------------------------------------------------ - def data_append(self, - what): - if isinstance(what, str): - self.data += [what] - else: - try: - for item in what: self.data_append(item) - except TypeError: - self.data += [str(what)] diff --git a/python/damask/_test.py b/python/damask/_test.py index 5cadc9dfe..000b76e0e 100644 --- a/python/damask/_test.py +++ b/python/damask/_test.py @@ -316,12 +316,6 @@ class Test: return self.compare_Array(refName,curName) - def compare_ArrayCurCur(self,cur0,cur1): - - cur0Name = self.fileInCurrent(cur0) - cur1Name = self.fileInCurrent(cur1) - return self.compare_Array(cur0Name,cur1Name) - def compare_Table(self,headings0,file0, headings1,file1, normHeadings='',normType=None,