Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

startup: Use universal newlines #1952

Merged
merged 4 commits into from
Mar 18, 2022
Merged

Conversation

HuidaeCho
Copy link
Member

str.split(os.linesep) doesn't work in Windows when a file is open in text mode. Use str.splitlines().

@neteler neteler added this to the 8.0.0 milestone Dec 8, 2021
@neteler neteler added backport_needed bug Something isn't working windows Microsoft Windows specific labels Dec 8, 2021
Copy link
Member

@wenzeslaus wenzeslaus left a comment

Choose a reason for hiding this comment

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

.split(os.linesep) -> .splitlines() makes sense. The other change is not needed. Resolving the merge conflict with fully accepting the change on main, ignoring changes here should resolves the issue because it is resolved in the main branch using JSON.

lib/init/grass.py Outdated Show resolved Hide resolved
@neteler
Copy link
Member

neteler commented Jan 9, 2022

@HuidaeCho shall we move the milestone to 8.0.1?

@neteler neteler modified the milestones: 8.0.0, 8.0.1 Jan 12, 2022
@wenzeslaus wenzeslaus modified the milestones: 8.0.1, 8.0.2 Feb 23, 2022
@HuidaeCho HuidaeCho dismissed wenzeslaus’s stale review March 18, 2022 03:06

Resolved; Dismissing review to merge it

@HuidaeCho HuidaeCho merged commit 98dba90 into OSGeo:main Mar 18, 2022
@HuidaeCho HuidaeCho deleted the startup_newline branch March 18, 2022 03:07
Copy link
Member

@wenzeslaus wenzeslaus left a comment

Choose a reason for hiding this comment

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

...I (would) approve :-)

neteler pushed a commit that referenced this pull request Mar 24, 2022
* startup: Use universal newlines

* wx is opened in universal newlines mode; juse use \n

* Remove %s
@neteler
Copy link
Member

neteler commented Mar 24, 2022

Backport done

ninsbl pushed a commit to ninsbl/grass that referenced this pull request Oct 26, 2022
* startup: Use universal newlines

* wx is opened in universal newlines mode; juse use \n

* Remove %s
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Feb 17, 2023
* startup: Use universal newlines

* wx is opened in universal newlines mode; juse use \n

* Remove %s
neteler pushed a commit to nilason/grass that referenced this pull request Nov 7, 2023
* startup: Use universal newlines

* wx is opened in universal newlines mode; juse use \n

* Remove %s
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working windows Microsoft Windows specific
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants