summaryrefslogtreecommitdiff
path: root/pygments
diff options
context:
space:
mode:
authorNate Whetsell <nathan.whetsell@gmail.com>2015-11-13 12:36:32 -0500
committerNate Whetsell <nathan.whetsell@gmail.com>2015-11-13 12:36:32 -0500
commit7b9d59b7fa5ae123e33260cb62ed57825940b36b (patch)
treea7a67918555ee6710637efab502178b5d73924bb /pygments
parent7d9698ecce2fa3505ee4a3a3522428c414a3e4c4 (diff)
parentbcae575b929fd3bb87dcbcfbabfd7fb634f3d6c9 (diff)
downloadpygments-7b9d59b7fa5ae123e33260cb62ed57825940b36b.tar.gz
Merged birkenfeld/pygments-main into default
Diffstat (limited to 'pygments')
-rwxr-xr-xpygments/formatters/_mapping.py9
-rw-r--r--pygments/lexers/_mapping.py9
2 files changed, 16 insertions, 2 deletions
diff --git a/pygments/formatters/_mapping.py b/pygments/formatters/_mapping.py
index a2e612ad..569ae849 100755
--- a/pygments/formatters/_mapping.py
+++ b/pygments/formatters/_mapping.py
@@ -66,11 +66,18 @@ if __name__ == '__main__': # pragma: no cover
# extract useful sourcecode from this file
with open(__file__) as fp:
content = fp.read()
+ # replace crnl to nl for Windows.
+ #
+ # Note that, originally, contributers should keep nl of master
+ # repository, for example by using some kind of automatic
+ # management EOL, like `EolExtension
+ # <https://www.mercurial-scm.org/wiki/EolExtension>`.
+ content = content.replace("\r\n", "\n")
header = content[:content.find('FORMATTERS = {')]
footer = content[content.find("if __name__ == '__main__':"):]
# write new file
- with open(__file__, 'w') as fp:
+ with open(__file__, 'wb') as fp:
fp.write(header)
fp.write('FORMATTERS = {\n %s\n}\n\n' % ',\n '.join(found_formatters))
fp.write(footer)
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index 8ab46e04..39d5e85a 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -446,11 +446,18 @@ if __name__ == '__main__': # pragma: no cover
# extract useful sourcecode from this file
with open(__file__) as fp:
content = fp.read()
+ # replace crnl to nl for Windows.
+ #
+ # Note that, originally, contributers should keep nl of master
+ # repository, for example by using some kind of automatic
+ # management EOL, like `EolExtension
+ # <https://www.mercurial-scm.org/wiki/EolExtension>`.
+ content = content.replace("\r\n", "\n")
header = content[:content.find('LEXERS = {')]
footer = content[content.find("if __name__ == '__main__':"):]
# write new file
- with open(__file__, 'w') as fp:
+ with open(__file__, 'wb') as fp:
fp.write(header)
fp.write('LEXERS = {\n %s,\n}\n\n' % ',\n '.join(found_lexers))
fp.write(footer)