Skip to content

Remove Python 2.7 leftovers#270

Merged
skjerns merged 6 commits intoholgern:masterfrom
DimitriPapadopoulos:py2
Jan 27, 2025
Merged

Remove Python 2.7 leftovers#270
skjerns merged 6 commits intoholgern:masterfrom
DimitriPapadopoulos:py2

Conversation

@DimitriPapadopoulos
Copy link
Copy Markdown
Contributor

@DimitriPapadopoulos DimitriPapadopoulos commented Jan 18, 2025 •
edited
Loading

Fixes #265.

@DimitriPapadopoulos DimitriPapadopoulos marked this pull request as draft January 18, 2025 17:40
@skjerns
Copy link
Copy Markdown
Collaborator

skjerns commented Jan 20, 2025

I think #265 should also fall under this

@DimitriPapadopoulos DimitriPapadopoulos force-pushed the py2 branch 3 times, most recently from 201cd0b to 9d95c22 Compare January 21, 2025 11:06
@DimitriPapadopoulos DimitriPapadopoulos marked this pull request as ready for review January 21, 2025 19:10
@DimitriPapadopoulos
Copy link
Copy Markdown
Contributor Author

DimitriPapadopoulos commented Jan 21, 2025

CI errors will be fixed by #266 / ab3c58c or #269 / 78ff00e.

@skjerns
Copy link
Copy Markdown
Collaborator

skjerns commented Jan 22, 2025

CI errors will be fixed by #266 / ab3c58c or #269 / 78ff00e.

sure! let me know when I can review

@DimitriPapadopoulos DimitriPapadopoulos force-pushed the py2 branch 8 times, most recently from b4b706c to 7eaa773 Compare January 26, 2025 16:35
@DimitriPapadopoulos
Copy link
Copy Markdown
Contributor Author

DimitriPapadopoulos commented Jan 26, 2025 •
edited
Loading

#265 should be fixed in its own PR. The current code needs to be cleaned up and it should be clarified whether header fields should be stored as str or byte. It's currently a messed up mix of both as far as I can understand.

@skjerns Ready for review.

@skjerns
Copy link
Copy Markdown
Collaborator

skjerns commented Jan 27, 2025 •
edited
Loading

Looks good, I made some small adjustements

@DimitriPapadopoulos
Copy link
Copy Markdown
Contributor Author

DimitriPapadopoulos commented Jan 27, 2025 •
edited
Loading

See my comment #270 (comment) above about du() and u().

In short, it must be made clear whether the ASCII header fields are stored as bytes or str. Right now, both are possible as far as I can see, hence the functions cannot be removed.

DimitriPapadopoulos
DimitriPapadopoulos commented Jan 27, 2025
View reviewed changes
pyedflib/highlevel.py
ch_idx = ch_names.index(ch.lower())
to_keep[i] = ch_idx
load_channels = to_keep.copy()
load_channels = list(to_keep)
Copy link
Copy Markdown
Contributor Author

@DimitriPapadopoulos DimitriPapadopoulos Jan 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to_keep is already a list, and to_keep.copy() is more readable. Why revert?

Copy link
Copy Markdown
Collaborator

@skjerns skjerns Jan 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be a numpy array as well, so convert to list just to be safe

Copy link
Copy Markdown
Contributor Author

@DimitriPapadopoulos DimitriPapadopoulos Jan 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's supposed to be a list. Why would it be a Numpy array?

@skjerns skjerns merged commit f905d60 into holgern:master Jan 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@skjerns skjerns skjerns left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Check if du() and u() are still necessary

2 participants

@DimitriPapadopoulos @skjerns