dcicutils 8.16.6.1b2__py3-none-any.whl → 8.16.6.1b3__py3-none-any.whl

Sign up to get free protection for your applications and to get access to all the features.
dcicutils/data_readers.py CHANGED
@@ -31,15 +31,22 @@ class RowReader(abc.ABC):
31
31
  self.open()
32
32
 
33
33
  def __iter__(self) -> Iterator:
34
+ header = self._iter_header()
34
35
  for row in self.rows:
35
36
  self.row_number += 1
36
37
  if self.is_comment_row(row):
37
38
  continue
38
39
  if self.is_terminating_row(row):
39
40
  break
40
- if len(self.header) < len(row): # Row values beyond what there are headers for are ignored.
41
+ if len(header) < len(row): # Row values beyond what there are headers for are ignored.
41
42
  self._warning_extra_values.append(self.row_number)
42
- yield {column: self.cell_value(value) for column, value in zip(self.header, row)}
43
+ yield self._iter_mapper({column: self.cell_value(value) for column, value in zip(header, row)})
44
+
45
+ def _iter_header(self) -> List[str]:
46
+ return self.header
47
+
48
+ def _iter_mapper(self, row: dict) -> List[str]:
49
+ return row
43
50
 
44
51
  def _define_header(self, header: List[Optional[Any]]) -> None:
45
52
  self.header = []
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: dcicutils
3
- Version: 8.16.6.1b2
3
+ Version: 8.16.6.1b3
4
4
  Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
5
5
  Home-page: https://github.com/4dn-dcic/utils
6
6
  License: MIT
@@ -10,7 +10,7 @@ dcicutils/common.py,sha256=U6tedhp6FFl9EUGoMqiMAqON_WqGJ_317JE_Tr4dXDs,3926
10
10
  dcicutils/contribution_scripts.py,sha256=0k5Gw1TumcD5SAcXVkDd6-yvuMEw-jUp5Kfb7FJH6XQ,2015
11
11
  dcicutils/contribution_utils.py,sha256=vYLS1JUB3sKd24BUxZ29qUBqYeQBLK9cwo8x3k64uPg,25653
12
12
  dcicutils/creds_utils.py,sha256=64BbIfS90T1eJmmQJrDyfrRa3V2F1x7T8lOrEeFfqJY,11127
13
- dcicutils/data_readers.py,sha256=6EMrY7TjDE8H7bA_TCWtpLQP7slJ0YTL77_dNh6e7sg,7626
13
+ dcicutils/data_readers.py,sha256=CgxWPB2hJzFfKqVUWL_0fERe4CZRMvt-5Afo9lqEt74,7813
14
14
  dcicutils/data_utils.py,sha256=k2OxOlsx7AJ6jF-YNlMyGus_JqSUBe4_n1s65Mv1gQQ,3098
15
15
  dcicutils/datetime_utils.py,sha256=xaJ9rzSsk4uBPidwV2sByrl2xcQiFWXTnx6HLpt8EcY,13650
16
16
  dcicutils/deployment_utils.py,sha256=6Sv1cM9T944d_9CTJt8O2RPtpw9MiTIPKw_DgYLOnCU,69916
@@ -75,8 +75,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
75
75
  dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
76
76
  dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
77
77
  dcicutils/zip_utils.py,sha256=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
78
- dcicutils-8.16.6.1b2.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
79
- dcicutils-8.16.6.1b2.dist-info/METADATA,sha256=i-xPCQVHWAq9lVfv_ohhvEz3DL0eJfOjmd58Q6i0LC0,3493
80
- dcicutils-8.16.6.1b2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
81
- dcicutils-8.16.6.1b2.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
82
- dcicutils-8.16.6.1b2.dist-info/RECORD,,
78
+ dcicutils-8.16.6.1b3.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
79
+ dcicutils-8.16.6.1b3.dist-info/METADATA,sha256=NMooRRWHCGqrfzf8D0lOhEuFyf7jQSM_TmgC4o3CfTk,3493
80
+ dcicutils-8.16.6.1b3.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
81
+ dcicutils-8.16.6.1b3.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
82
+ dcicutils-8.16.6.1b3.dist-info/RECORD,,