Skip to content

Commit 4db2c25

Browse files
birkenfeldbirkenfeld
committed
Add .hgeol file and fix newlines in the 2.5 branch.
1 parent 2af945c commit 4db2c25

File tree

10 files changed

+627
-588
lines changed

10 files changed

+627
-588
lines changed

‎.hgeol

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
[patterns]
2+
3+
# Non human-editable files are binary
4+
5+
**.dsp = BIN
6+
**.dsw = BIN
7+
**.mk = BIN
8+
**.sln = BIN
9+
**.vcproj = BIN
10+
**.vsprops = BIN
11+
12+
**.aif = BIN
13+
**.au = BIN
14+
**.bmp = BIN
15+
**.db = BIN
16+
**.exe = BIN
17+
**.icns = BIN
18+
**.gif = BIN
19+
**.ico = BIN
20+
**.info = BIN
21+
**.jpg = BIN
22+
**.pck = BIN
23+
**.png = BIN
24+
**.psd = BIN
25+
**.tar = BIN
26+
**.xar = BIN
27+
**.zip = BIN
28+
29+
Lib/email/test/data/msg_26.txt = BIN
30+
Lib/test/sndhdrdata/sndhdr.* = BIN
31+
Lib/test/decimaltestdata/*.decTest = BIN
32+
33+
# All other files (which presumably are human-editable) are "native".
34+
# This must be the last rule!
35+
36+
** = native
37+
38+
[repository]
39+
native = LF

‎Doc/lib/xmletree.tex

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
\section{\module{xml.etree} ---
2-
The ElementTree API for XML}
3-
4-
\declaremodule{standard}{xml.etree}
5-
\modulesynopsis{Package containing common ElementTree modules.}
6-
\moduleauthor{Fredrik Lundh}{fredrik@pythonware.com}
7-
8-
\versionadded{2.5}
9-
10-
The ElementTree package is a simple, efficient, and quite popular
11-
library for XML manipulation in Python.
12-
13-
The \module{xml.etree} package contains the most common components
14-
from the ElementTree API library.
15-
In the current release, this package contains the \module{ElementTree},
16-
\module{ElementPath}, and \module{ElementInclude} modules from the full
17-
ElementTree distribution.
18-
19-
% XXX To be continued!
20-
21-
\begin{seealso}
22-
\seetitle[http://effbot.org/tag/elementtree]
23-
{ElementTree Overview}
24-
{The home page for \module{ElementTree}. This includes links
25-
to additional documentation, alternative implementations, and
26-
other add-ons.}
27-
\end{seealso}
1+
\section{\module{xml.etree} ---
2+
The ElementTree API for XML}
3+
4+
\declaremodule{standard}{xml.etree}
5+
\modulesynopsis{Package containing common ElementTree modules.}
6+
\moduleauthor{Fredrik Lundh}{fredrik@pythonware.com}
7+
8+
\versionadded{2.5}
9+
10+
The ElementTree package is a simple, efficient, and quite popular
11+
library for XML manipulation in Python.
12+
13+
The \module{xml.etree} package contains the most common components
14+
from the ElementTree API library.
15+
In the current release, this package contains the \module{ElementTree},
16+
\module{ElementPath}, and \module{ElementInclude} modules from the full
17+
ElementTree distribution.
18+
19+
% XXX To be continued!
20+
21+
\begin{seealso}
22+
\seetitle[http://effbot.org/tag/elementtree]
23+
{ElementTree Overview}
24+
{The home page for \module{ElementTree}. This includes links
25+
to additional documentation, alternative implementations, and
26+
other add-ons.}
27+
\end{seealso}

‎Lib/test/test_pep263.py

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
#! -*- coding: koi8-r -*-
2-
# This file is marked as binary in SVN, to prevent MacCVS from recoding it.
3-
4-
import unittest
5-
from test import test_support
6-
7-
class PEP263Test(unittest.TestCase):
8-
9-
def test_pep263(self):
10-
self.assertEqual(
11-
u"ðÉÔÏÎ".encode("utf-8"),
12-
'\xd0\x9f\xd0\xb8\xd1\x82\xd0\xbe\xd0\xbd'
13-
)
14-
self.assertEqual(
15-
u"\ð".encode("utf-8"),
16-
'\\\xd0\x9f'
17-
)
18-
19-
def test_compilestring(self):
20-
# see #1882
21-
c = compile("\n# coding: utf-8\nu = u'\xc3\xb3'\n", "dummy", "exec")
22-
d = {}
23-
exec c in d
24-
self.assertEqual(d['u'], u'\xf3')
25-
26-
27-
def test_main():
28-
test_support.run_unittest(PEP263Test)
29-
30-
if __name__=="__main__":
31-
test_main()
1+
#! -*- coding: koi8-r -*-
2+
# This file is marked as binary in SVN, to prevent MacCVS from recoding it.
3+
4+
import unittest
5+
from test import test_support
6+
7+
class PEP263Test(unittest.TestCase):
8+
9+
def test_pep263(self):
10+
self.assertEqual(
11+
u"ðÉÔÏÎ".encode("utf-8"),
12+
'\xd0\x9f\xd0\xb8\xd1\x82\xd0\xbe\xd0\xbd'
13+
)
14+
self.assertEqual(
15+
u"\ð".encode("utf-8"),
16+
'\\\xd0\x9f'
17+
)
18+
19+
def test_compilestring(self):
20+
# see #1882
21+
c = compile("\n# coding: utf-8\nu = u'\xc3\xb3'\n", "dummy", "exec")
22+
d = {}
23+
exec c in d
24+
self.assertEqual(d['u'], u'\xf3')
25+
26+
27+
def test_main():
28+
test_support.run_unittest(PEP263Test)
29+
30+
if __name__=="__main__":
31+
test_main()

‎PCbuild/build_ssl.bat

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
@echo off
2-
if not defined HOST_PYTHON (
3-
if %1 EQU Debug (
4-
set HOST_PYTHON=python_d.exe
5-
) ELSE (
6-
set HOST_PYTHON=python.exe
7-
)
8-
)
9-
%HOST_PYTHON% build_ssl.py %1 %2
10-
1+
@echo off
2+
if not defined HOST_PYTHON (
3+
if %1 EQU Debug (
4+
set HOST_PYTHON=python_d.exe
5+
) ELSE (
6+
set HOST_PYTHON=python.exe
7+
)
8+
)
9+
%HOST_PYTHON% build_ssl.py %1 %2
10+

0 commit comments

Comments
 (0)