Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 32dde22

Browse files
nnorwitznnorwitz
committed
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62128,62130,62132,62134-62135,62137,62139-62140,62144,62146,62151,62155,62157,62162-62166,62171-62172,62175-62176,62178,62181-62186,62188-62192,62196,62200-62203,62206,62211-62213,62215-62218,62222,62224-62226,62228,62232,62236,62240-62245,62248,62250-62254,62256-62258,62262,62264-62265,62267-62270,62272-62276,62280-62288,62291-62292,62299-62301,62307,62312,62316-62318,62322-62331,62333-62337,62339-62344,62346-62348 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r62323 | brett.cannon | 2008-04-13 10:09:43 -0700 (Sun, 13 Apr 2008) | 3 lines Add an explicit check for output in a test to try to diagnose a failure on Windows. ........ r62324 | brett.cannon | 2008-04-13 10:41:31 -0700 (Sun, 13 Apr 2008) | 3 lines Fix spliting on colons on Windows machines with a file path by limiting the number of splits. ........ r62329 | benjamin.peterson | 2008-04-13 13:35:56 -0700 (Sun, 13 Apr 2008) | 2 lines #2627 Let it be known what pgen generates ........ r62330 | benjamin.peterson | 2008-04-13 13:40:03 -0700 (Sun, 13 Apr 2008) | 2 lines Added an ignore file for Bazaar #2510 ........ r62331 | georg.brandl | 2008-04-13 13:50:29 -0700 (Sun, 13 Apr 2008) | 2 lines Improve -X error message. ........ r62334 | andrew.kuchling | 2008-04-13 15:39:12 -0700 (Sun, 13 Apr 2008) | 1 line Add example ........ r62340 | amaury.forgeotdarc | 2008-04-14 12:55:40 -0700 (Mon, 14 Apr 2008) | 2 lines Update project files for all Windows supported compilers ........ r62341 | amaury.forgeotdarc | 2008-04-14 13:07:48 -0700 (Mon, 14 Apr 2008) | 6 lines Correct a refleak found by "regrtest.py -R:: test_structmembers" Some other minor updates in _warnings.c: - make a function static - rename a shadowing local variable ........ r62347 | andrew.kuchling | 2008-04-14 19:24:15 -0700 (Mon, 14 Apr 2008) | 1 line Various items; begin writing the SSL section ........ r62348 | neal.norwitz | 2008-04-14 20:46:21 -0700 (Mon, 14 Apr 2008) | 1 line Prevent namespace pollution, add static for internal functions ........
1 parent d6372b9 commit 32dde22

14 files changed

Lines changed: 102 additions & 24 deletions

File tree

‎.bzrignore‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
.purify
2+
autom4te.cache
3+
config.log
4+
config.cache
5+
config.status
6+
config.status.lineno
7+
db_home
8+
Makefile
9+
buildno
10+
python
11+
build
12+
Makefile.pre
13+
platform
14+
pyconfig.h
15+
libpython*.a
16+
python.exe
17+
CP936.TXT
18+
SHIFT_JISX0213.TXT
19+
JOHAB.TXT
20+
EUC-JP.TXT
21+
NormalizationTest-3.2.0.txt
22+
NormalizationTest.txt
23+
BIG5.TXT
24+
BIG5HKSCS-2004.TXT
25+
CP949.TXT
26+
EUC-CN.TXT
27+
BIG5HKSCS.TXT
28+
SHIFTJIS.TXT
29+
EUC-KR.TXT
30+
EUC-JISX0213.TXT
31+
CP932.TXT
32+
CP950.TXT
33+
reflog.txt
34+
gb-18030-2000.xml
35+
tags
36+
TAGS
37+
.gdb_history
38+
Modules/Setup
39+
Modules/Setup.config
40+
Modules/Setup.local
41+
Modules/config.c
42+
Parser/pgen
43+
Lib/plat-mac/errors.rsrc.df.rsrc

‎Doc/whatsnew/2.6.rst‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,13 @@ There's also a ``__future__`` import that causes all string literals
736736
to become Unicode strings. This means that ``\u`` escape sequences
737737
can be used to include Unicode characters.
738738

739-
XXX give example
739+
from __future__ import unicode_literals
740+
741+
s = ('\u751f\u3080\u304e\u3000\u751f\u3054'
742+
'\u3081\u3000\u751f\u305f\u307e\u3054')
743+
744+
print len(s) # 12 Unicode characters
745+
740746

741747
.. seealso::
742748

@@ -819,7 +825,8 @@ their own implementations of buffering and text I/O.
819825

820826
:pep:`3116` - New I/O
821827
PEP written by Daniel Stutzbach, Mike Verdone, and Guido van Rossum.
822-
XXX code written by who?
828+
Code by Guido van Rossum, Georg Brandl, Walter Doerwald,
829+
Jeremy Hylton, Martin von Loewis, Tony Lownds, and others.
823830

824831
.. ======================================================================
825832
@@ -1090,8 +1097,6 @@ This is equivalent to::
10901097

10911098
A = foo(bar(A))
10921099

1093-
XXX need to find a good motivating example.
1094-
10951100
.. seealso::
10961101

10971102
:pep:`3129` - Class Decorators
@@ -1848,6 +1853,10 @@ complete list of changes, or look through the CVS logs for all the details.
18481853
environments. TIPC addresses are 4- or 5-tuples.
18491854
(Contributed by Alberto Bertogli; :issue:`1646`.)
18501855

1856+
A new function, :func:`create_connection`, takes an address
1857+
and connects to it using an optional timeout value, returning
1858+
the connected socket object.
1859+
18511860
* The base classes in the :mod:`SocketServer` module now support
18521861
calling a :meth:`handle_timeout` method after a span of inactivity
18531862
specified by the server's :attr:`timeout` attribute. (Contributed
@@ -2036,15 +2045,21 @@ Improved SSL Support
20362045
--------------------------------------------------
20372046

20382047
Bill Janssen made extensive improvements to Python 2.6's support for
2039-
SSL.
2040-
2041-
XXX use ssl.sslsocket - subclass of socket.socket.
2048+
the Secure Sockets Layer by adding a new module, :mod:`ssl`, on top of
2049+
the `OpenSSL <http://www.openssl.org/>`__ library. This new module
2050+
provides more control over the protocol negotiated, the X.509
2051+
certificates used, and has better support for writing SSL servers (as
2052+
opposed to clients) in Python. The existing SSL support in the
2053+
:mod:`socket` module hasn't been removed and continues to work,
2054+
though it will be removed in Python 3.0.
2055+
2056+
To use the new module, first you must create a TCP connection in the
2057+
usual way and then pass it to the :func:`ssl.wrap_socket` function.
2058+
XXX describe parameters.
20422059

20432060
XXX Can specify if certificate is required, and obtain certificate info
20442061
by calling getpeercert method.
20452062

2046-
XXX sslwrap() behaves like socket.ssl
2047-
20482063
XXX Certain features require the OpenSSL package to be installed, notably
20492064
the 'openssl' binary.
20502065

‎Include/graminit.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* Generated by Parser/pgen */
2+
13
#define single_input 256
24
#define file_input 257
35
#define eval_input 258

‎Lib/test/test_warnings.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,8 @@ def test_show_warning_output(self):
328328
"Too many newlines in %r" % result)
329329
first_line, second_line = result.split('\n', 1)
330330
expected_file = os.path.splitext(warning_tests.__file__)[0] + '.py'
331-
path, line, warning_class, message = first_line.split(':')
331+
first_line_parts = first_line.rsplit(':', 3)
332+
path, line, warning_class, message = first_line_parts
332333
line = int(line)
333334
self.failUnlessEqual(expected_file, path)
334335
self.failUnlessEqual(warning_class, ' ' + UserWarning.__name__)

‎Modules/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ Py_Main(int argc, wchar_t **argv)
380380
skipfirstline = 1;
381381
break;
382382

383-
/* case 'X': reserved for non-standard arguments */
383+
/* case 'X': reserved for implementation-specific arguments */
384384

385385
case 'h':
386386
case '?':

‎Objects/descrobject.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ static PyMemberDef property_members[] = {
10831083
PyDoc_STRVAR(getter_doc,
10841084
"Descriptor to change the getter on a property.");
10851085

1086-
PyObject *
1086+
static PyObject *
10871087
property_getter(PyObject *self, PyObject *getter)
10881088
{
10891089
return property_copy(self, getter, NULL, NULL, NULL);
@@ -1093,7 +1093,7 @@ property_getter(PyObject *self, PyObject *getter)
10931093
PyDoc_STRVAR(setter_doc,
10941094
"Descriptor to change the setter on a property.");
10951095

1096-
PyObject *
1096+
static PyObject *
10971097
property_setter(PyObject *self, PyObject *setter)
10981098
{
10991099
return property_copy(self, NULL, setter, NULL, NULL);
@@ -1103,7 +1103,7 @@ property_setter(PyObject *self, PyObject *setter)
11031103
PyDoc_STRVAR(deleter_doc,
11041104
"Descriptor to change the deleter on a property.");
11051105

1106-
PyObject *
1106+
static PyObject *
11071107
property_deleter(PyObject *self, PyObject *deleter)
11081108
{
11091109
return property_copy(self, NULL, NULL, deleter, NULL);

‎PC/VC6/pythoncore.dsp‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PC/VS7.1/pythoncore.vcproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,9 @@
409409
<File
410410
RelativePath="..\..\Modules\arraymodule.c">
411411
</File>
412+
<File
413+
RelativePath="..\..\Python\_warnings.c">
414+
</File>
412415
<File
413416
RelativePath="..\..\Python\asdl.c">
414417
</File>

‎PC/VS8.0/pythoncore.vcproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,6 +1586,10 @@
15861586
<Filter
15871587
Name="Python"
15881588
>
1589+
<File
1590+
RelativePath="..\..\Python\_warnings.c"
1591+
>
1592+
</File>
15891593
<File
15901594
RelativePath="..\..\Python\asdl.c"
15911595
>

‎PCbuild/pythoncore.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,6 +1586,10 @@
15861586
<Filter
15871587
Name="Python"
15881588
>
1589+
<File
1590+
RelativePath="..\Python\_warnings.c"
1591+
>
1592+
</File>
15891593
<File
15901594
RelativePath="..\Python\asdl.c"
15911595
>
@@ -1746,10 +1750,6 @@
17461750
RelativePath="..\Python\traceback.c"
17471751
>
17481752
</File>
1749-
<File
1750-
RelativePath="..\Python\_warnings.c"
1751-
>
1752-
</File>
17531753
</Filter>
17541754
<Filter
17551755
Name="Resource Files"

0 commit comments

Comments
 (0)