-
-
Notifications
You must be signed in to change notification settings - Fork 32.3k
gh-102507 Remove invisible pagebreak characters #102531
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d65d478
Remove invisible pagebreak characters
JosephSBoyle 2a8316e
Add missing newlines (pep-8)
JosephSBoyle 0e870c0
Fix mangled non-english characters in pygettext.py
JosephSBoyle f5d7896
Add missing newline
JosephSBoyle f09bd16
Merge branch 'main' into fix-issue-102507
JosephSBoyle ec158cd
Revert undesirable changes to `pygettext`
AlexWaygood File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
# Minimally patched to make it even more xgettext compatible | ||
# by Peter Funk <[email protected]> | ||
# | ||
# 2002-11-22 J�rgen Hermann <[email protected]> | ||
# 2002-11-22 J�rgen Hermann <[email protected]> | ||
JosephSBoyle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# Added checks that _() only contains string literals, and | ||
# command line args are resolved to module lists, i.e. you | ||
# can now pass a filename, a module or package name, or a | ||
|
@@ -174,7 +174,6 @@ | |
EMPTYSTRING = '' | ||
|
||
|
||
|
||
# The normal pot-file header. msgmerge and Emacs's po-mode work better if it's | ||
# there. | ||
pot_header = _('''\ | ||
|
@@ -196,20 +195,18 @@ | |
|
||
''') | ||
|
||
AlexWaygood marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
def usage(code, msg=''): | ||
print(__doc__ % globals(), file=sys.stderr) | ||
if msg: | ||
print(msg, file=sys.stderr) | ||
sys.exit(code) | ||
|
||
|
||
|
||
def make_escapes(pass_nonascii): | ||
global escapes, escape | ||
if pass_nonascii: | ||
# Allow non-ascii characters to pass through so that e.g. 'msgid | ||
# "H�he"' would result not result in 'msgid "H\366he"'. Otherwise we | ||
# "H�he"' would result not result in 'msgid "H\366he"'. Otherwise we | ||
JosephSBoyle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# escape any character outside the 32..126 range. | ||
mod = 128 | ||
escape = escape_ascii | ||
|
@@ -258,7 +255,7 @@ def normalize(s, encoding): | |
s = '""\n"' + lineterm.join(lines) + '"' | ||
return s | ||
|
||
|
||
def containsAny(str, set): | ||
"""Check whether 'str' contains ANY of the chars in 'set'""" | ||
return 1 in [c in str for c in set] | ||
|
@@ -307,7 +304,6 @@ def getFilesForName(name): | |
|
||
return [] | ||
|
||
AlexWaygood marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
class TokenEater: | ||
def __init__(self, options): | ||
self.__options = options | ||
|
@@ -515,7 +511,6 @@ def write(self, fp): | |
print('msgstr ""\n', file=fp) | ||
|
||
|
||
|
||
def main(): | ||
global default_keywords | ||
try: | ||
|
@@ -675,7 +670,6 @@ class Options: | |
if closep: | ||
fp.close() | ||
|
||
AlexWaygood marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
if __name__ == '__main__': | ||
main() | ||
# some more test strings | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.