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
Adding support to Unicode characters over codepoint 0xffff #63
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a06c1f6
A change to a message
peterkmurphy cf1c86c
First attack at pyyaml does not support literals in unicode over code…
peterkmurphy c60232d
Added emoticon test data files (which will probably break testing)
peterkmurphy c67d8df
Suspicious 'expected an exception' messages trimmed
peterkmurphy 94c3f07
Reverting README to old copy
peterkmurphy File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 |
---|---|---|
|
@@ -8,9 +8,13 @@ | |
|
||
__all__ = ['Emitter', 'EmitterError'] | ||
|
||
import sys | ||
|
||
from error import YAMLError | ||
from events import * | ||
|
||
has_ucs4 = sys.maxunicode > 0xffff | ||
|
||
class EmitterError(YAMLError): | ||
pass | ||
|
||
|
@@ -674,7 +678,7 @@ def analyze_scalar(self, scalar): | |
# Check for indicators. | ||
if index == 0: | ||
# Leading indicators are special characters. | ||
if ch in u'#,[]{}&*!|>\'\"%@`': | ||
if ch in u'#,[]{}&*!|>\'\"%@`': | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. trimming trailing whitespace is bad form as it's diff noise |
||
flow_indicators = True | ||
block_indicators = True | ||
if ch in u'?:': | ||
|
@@ -701,7 +705,8 @@ def analyze_scalar(self, scalar): | |
line_breaks = True | ||
if not (ch == u'\n' or u'\x20' <= ch <= u'\x7E'): | ||
if (ch == u'\x85' or u'\xA0' <= ch <= u'\uD7FF' | ||
or u'\uE000' <= ch <= u'\uFFFD') and ch != u'\uFEFF': | ||
or u'\uE000' <= ch <= u'\uFFFD' | ||
or ((not has_ucs4) or (u'\U00010000' <= ch < u'\U0010ffff'))) and ch != u'\uFEFF': | ||
unicode_characters = True | ||
if not self.allow_unicode: | ||
special_characters = True | ||
|
@@ -1137,4 +1142,3 @@ def write_plain(self, text, split=True): | |
spaces = (ch == u' ') | ||
breaks = (ch in u'\n\x85\u2028\u2029') | ||
end += 1 | ||
|
This file contains 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 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 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 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 |
---|---|---|
@@ -0,0 +1,10 @@ | ||
😀😁😂😃😄😅😆😇 | ||
😈😉😊😋😌😍😎😏 | ||
😐😑😒😓😔😕😖😗 | ||
😘😙😚😛😜😝😞😟 | ||
😠😡😢😣😤😥😦😧 | ||
😨😩😪😫😬😭😮😯 | ||
😰😱😲😳😴😵😶😷 | ||
😸😹😺😻😼😽😾😿 | ||
🙀🙁🙂🙃🙄🙅🙆🙇 | ||
🙈🙉🙊🙋🙌🙍🙎🙏 |
This file contains 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 |
---|---|---|
@@ -0,0 +1 @@ | ||
😀 |
This file contains 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 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removing trailing newlines is bad form as it's diff noise. I'd undo it for all the files you've added it for, which seems to be every file you've touched. Also files should end with a trailing newline to be POSIX valid