@@ -2111,10 +2111,6 @@ def set_info(self, info):
2111
2111
if idx is not None :
2112
2112
self .__dict__ .update (idx )
2113
2113
2114
- def get_attr (self ):
2115
- """ set the kind for this column """
2116
- self .kind = getattr (self .attrs , self .kind_attr , None )
2117
-
2118
2114
def set_attr (self ):
2119
2115
""" set the kind for this column """
2120
2116
setattr (self .attrs , self .kind_attr , self .kind )
@@ -2161,9 +2157,6 @@ def convert(self, values: np.ndarray, nan_rep, encoding: str, errors: str):
2161
2157
assert isinstance (values , np .ndarray ), type (values )
2162
2158
self .values = Int64Index (np .arange (len (values )))
2163
2159
2164
- def get_attr (self ):
2165
- pass
2166
-
2167
2160
def set_attr (self ):
2168
2161
pass
2169
2162
@@ -2363,6 +2356,7 @@ def convert(self, values: np.ndarray, nan_rep, encoding: str, errors: str):
2363
2356
self .data = values
2364
2357
2365
2358
own_data = self .data
2359
+ assert isinstance (own_data , np .ndarray ) # for mypy
2366
2360
2367
2361
# use the meta if needed
2368
2362
meta = _ensure_decoded (self .meta )
@@ -2430,15 +2424,6 @@ def convert(self, values: np.ndarray, nan_rep, encoding: str, errors: str):
2430
2424
2431
2425
self .data = own_data
2432
2426
2433
- def get_attr (self ):
2434
- """ get the data for this column """
2435
- self .values = getattr (self .attrs , self .kind_attr , None )
2436
- self .dtype = getattr (self .attrs , self .dtype_attr , None )
2437
- self .meta = getattr (self .attrs , self .meta_attr , None )
2438
- assert self .typ is not None
2439
- assert self .dtype is not None
2440
- self .kind = _dtype_to_kind (self .dtype )
2441
-
2442
2427
def set_attr (self ):
2443
2428
""" set the data for this column """
2444
2429
setattr (self .attrs , self .kind_attr , self .values )
@@ -2477,8 +2462,7 @@ def get_atom_timedelta64(cls, shape):
2477
2462
class GenericDataIndexableCol (DataIndexableCol ):
2478
2463
""" represent a generic pytables data column """
2479
2464
2480
- def get_attr (self ):
2481
- pass
2465
+ pass
2482
2466
2483
2467
2484
2468
class Fixed :
@@ -3424,6 +3408,7 @@ def indexables(self):
3424
3408
_indexables = []
3425
3409
3426
3410
desc = self .description
3411
+ table_attrs = self .table .attrs
3427
3412
3428
3413
# Note: each of the `name` kwargs below are str, ensured
3429
3414
# by the definition in index_cols.
@@ -3432,16 +3417,20 @@ def indexables(self):
3432
3417
atom = getattr (desc , name )
3433
3418
md = self .read_metadata (name )
3434
3419
meta = "category" if md is not None else None
3420
+
3421
+ kind_attr = f"{ name } _kind"
3422
+ kind = getattr (table_attrs , kind_attr , None )
3423
+
3435
3424
index_col = IndexCol (
3436
3425
name = name ,
3437
3426
axis = axis ,
3438
3427
pos = i ,
3428
+ kind = kind ,
3439
3429
typ = atom ,
3440
3430
table = self .table ,
3441
3431
meta = meta ,
3442
3432
metadata = md ,
3443
3433
)
3444
- index_col .get_attr ()
3445
3434
_indexables .append (index_col )
3446
3435
3447
3436
# values columns
@@ -3456,18 +3445,29 @@ def f(i, c):
3456
3445
3457
3446
atom = getattr (desc , c )
3458
3447
adj_name = _maybe_adjust_name (c , self .version )
3448
+
3449
+ # TODO: why kind_attr here?
3450
+ values = getattr (table_attrs , f"{ adj_name } _kind" , None )
3451
+ dtype = getattr (table_attrs , f"{ adj_name } _dtype" , None )
3452
+ kind = _dtype_to_kind (dtype )
3453
+
3459
3454
md = self .read_metadata (c )
3460
- meta = "category" if md is not None else None
3455
+ # TODO: figure out why these two versions of `meta` dont always match.
3456
+ # meta = "category" if md is not None else None
3457
+ meta = getattr (table_attrs , f"{ adj_name } _meta" , None )
3458
+
3461
3459
obj = klass (
3462
3460
name = adj_name ,
3463
3461
cname = c ,
3462
+ values = values ,
3463
+ kind = kind ,
3464
3464
pos = base_pos + i ,
3465
3465
typ = atom ,
3466
3466
table = self .table ,
3467
3467
meta = meta ,
3468
3468
metadata = md ,
3469
+ dtype = dtype ,
3469
3470
)
3470
- obj .get_attr ()
3471
3471
return obj
3472
3472
3473
3473
# Note: the definition of `values_cols` ensures that each
@@ -4491,7 +4491,6 @@ def indexables(self):
4491
4491
index_col = GenericIndexCol (
4492
4492
name = "index" , axis = 0 , table = self .table , meta = meta , metadata = md
4493
4493
)
4494
- index_col .get_attr ()
4495
4494
4496
4495
_indexables = [index_col ]
4497
4496
@@ -4510,7 +4509,6 @@ def indexables(self):
4510
4509
meta = meta ,
4511
4510
metadata = md ,
4512
4511
)
4513
- dc .get_attr ()
4514
4512
_indexables .append (dc )
4515
4513
4516
4514
return _indexables
0 commit comments