[pypy-svn] r64718 - in pypy/release/1.1.x: lib-python pypy/doc pypy/lib pypy/module/_ssl pypy/module/posix
pedronis at codespeak.net
pedronis at codespeak.net
Mon Apr 27 11:27:06 CEST 2009
Author: pedronis
Date: Mon Apr 27 11:27:03 2009
New Revision: 64718
Modified:
pypy/release/1.1.x/lib-python/conftest.py
pypy/release/1.1.x/pypy/doc/cpython_differences.txt
pypy/release/1.1.x/pypy/doc/windows.txt
pypy/release/1.1.x/pypy/lib/_pypy_interact.py
pypy/release/1.1.x/pypy/lib/_pypy_irc_topic.py
pypy/release/1.1.x/pypy/module/_ssl/interp_ssl.py
pypy/release/1.1.x/pypy/module/posix/app_posix.py
Log:
(iko, pedronis)
Merging fixes from trunk for the release
------------------------------------------------------------------------
r64665 | arigo | 2009-04-25 11:19:05 +0200 (Sat, 25 Apr 2009) | 2 lines
Changed paths:
M /pypy/trunk/pypy/doc/windows.txt
Fix the name of the option requiring Boehm.
------------------------------------------------------------------------
r64667 | arigo | 2009-04-25 11:45:21 +0200 (Sat, 25 Apr 2009) | 2 lines
Changed paths:
M /pypy/trunk/pypy/lib/_pypy_interact.py
M /pypy/trunk/pypy/lib/_pypy_irc_topic.py
Update the irc topics.
------------------------------------------------------------------------
r64683 | pedronis | 2009-04-26 11:23:28 +0200 (Sun, 26 Apr 2009) | 1 line
Changed paths:
M /pypy/trunk/lib-python/conftest.py
better skip message
------------------------------------------------------------------------
r64684 | pedronis | 2009-04-26 12:25:17 +0200 (Sun, 26 Apr 2009) | 3 lines
Changed paths:
M /pypy/trunk/pypy/module/_ssl/interp_ssl.py
this fixes the default translation on Mac OS X
------------------------------------------------------------------------
r64715 | pedronis | 2009-04-27 10:11:42 +0200 (Mon, 27 Apr 2009) | 1 line
Changed paths:
M /pypy/trunk/pypy/module/posix/app_posix.py
minimal fix for os.popen on windows (not tried)
------------------------------------------------------------------------
r64717 | pedronis | 2009-04-27 11:13:49 +0200 (Mon, 27 Apr 2009) | 3 lines
Changed paths:
M /pypy/trunk/lib-python/conftest.py
M /pypy/trunk/pypy/doc/cpython_differences.txt
_ssl translates but is buggy
Modified: pypy/release/1.1.x/lib-python/conftest.py
==============================================================================
--- pypy/release/1.1.x/lib-python/conftest.py (original)
+++ pypy/release/1.1.x/lib-python/conftest.py Mon Apr 27 11:27:03 2009
@@ -156,7 +156,7 @@
RegrTest('test_bz2.py', usemodules='bz2'),
RegrTest('test_calendar.py'),
RegrTest('test_call.py', core=True),
- RegrTest('test_capi.py', skip=True),
+ RegrTest('test_capi.py', skip="not applicable"),
RegrTest('test_cd.py', skip=True),
RegrTest('test_cfgparser.py'),
@@ -374,7 +374,7 @@
RegrTest('test_slice.py', core=True),
RegrTest('test_socket.py', usemodules='thread _weakref'),
- RegrTest('test_socket_ssl.py', skip="no ssl support yet"),
+ RegrTest('test_socket_ssl.py', skip="ssl support is still buggy"),
RegrTest('test_socketserver.py', usemodules='thread'),
RegrTest('test_softspace.py', core=True),
Modified: pypy/release/1.1.x/pypy/doc/cpython_differences.txt
==============================================================================
--- pypy/release/1.1.x/pypy/doc/cpython_differences.txt (original)
+++ pypy/release/1.1.x/pypy/doc/cpython_differences.txt Mon Apr 27 11:27:03 2009
@@ -27,7 +27,6 @@
`_rawffi`_
_socket
_sre
- _ssl
_weakref
bz2
cStringIO
Modified: pypy/release/1.1.x/pypy/doc/windows.txt
==============================================================================
--- pypy/release/1.1.x/pypy/doc/windows.txt (original)
+++ pypy/release/1.1.x/pypy/doc/windows.txt Mon Apr 27 11:27:03 2009
@@ -33,8 +33,10 @@
The Boehm garbage collector
~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This library is needed if you plan to use the ``--gc=ref`` translation
-option. You may get it at
+This library is needed if you plan to use the ``--gc=boehm`` translation
+option (this is the default at some optimization levels like ``-O1``,
+but unneeded for high-performance translations like ``-O2``).
+You may get it at
http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz
Versions 7.0 and 7.1 are known to work; the 6.x series won't work with
Modified: pypy/release/1.1.x/pypy/lib/_pypy_interact.py
==============================================================================
--- pypy/release/1.1.x/pypy/lib/_pypy_interact.py (original)
+++ pypy/release/1.1.x/pypy/lib/_pypy_interact.py Mon Apr 27 11:27:03 2009
@@ -8,7 +8,7 @@
from _pypy_irc_topic import some_topic
text = "And now for something completely different: ``%s''" % (
some_topic(),)
- if len(text) >= 80:
+ while len(text) >= 80:
i = text[:80].rfind(' ')
print text[:i]
text = text[i+1:]
Modified: pypy/release/1.1.x/pypy/lib/_pypy_irc_topic.py
==============================================================================
--- pypy/release/1.1.x/pypy/lib/_pypy_irc_topic.py (original)
+++ pypy/release/1.1.x/pypy/lib/_pypy_irc_topic.py Mon Apr 27 11:27:03 2009
@@ -67,6 +67,74 @@
gur 'fhcre' xrljbeq vf abg gung uhttnoyr
wlguba cngpurf ner abg rabhtu sbe clcl
- qb lbh xabj oreyva? - nyy bs vg? - jryy, whfg oreyva
+- ubj jvyy gur snpg gung gurl ner hfrq va bhe ercy punatr bhe gbcvpf?
+- ubj pna vg rire unir jbexrq?
+- jurer fubhyq gur unpx or fgberq?
+- Vg'f uneq gb fnl rknpgyl jung pbafgvghgrf erfrnepu va gur pbzchgre jbeyq, ohg nf n svefg nccebkvzngvba, vg'f fbsgjner gung qbrfa'g unir hfref.
+- Cebtenzzvat vf nyy nobhg xabjvat jura gb obvy gur benatr fcbatr qbaxrl npebff gur cuvyyvcvarf
+- Jul fb znal, znal, znal, znal, znal, znal qhpxyvatf?
+- ab qrgnvy vf bofpher rabhtu gb abg unir fbzr pbqr qrcraqvat ba vg.
+- jung V trarenyyl jnag vf serr fcrrqhcf
+- nyy bs ClCl vf kv-dhnyvgl
+"lbh pna nyjnlf xvyy -9 be bf._rkvg() vs lbh'er va n uheel"
+Ohernhpengf ohvyq npnqrzvp rzcverf juvpu puhea bhg zrnavatyrff fbyhgvbaf gb veeryrinag ceboyrzf.
+vg'f abg n unpx, vg'f n jbexnebhaq
+ClCl qbrfa'g unir pbcbylinevnqvp qrcraqragyl-zbabzbecurq ulcresyhknqf
+ClCl qbrfa'g punatr gur shaqnzragny culfvpf pbafgnagf
+Qnapr bs gur Fhtnecyhz Snvel
+Wnin vf whfg tbbq rabhtu gb or cenpgvpny, ohg abg tbbq rabhtu gb or hfnoyr.
+RhebClguba vf unccravat, qba'g rkcrpg nal dhvpx erfcbafr gvzrf.
+"V jbhyq yvxr gb fgnl njnl sebz ernyvgl gura"
+"gung'f jul gur 'be' vf ernyyl na 'naq' "
+jvgu nyy nccebcevngr pbagrkghnyvfngvbavat
+qba'g gevc ba gur cbjre pbeq
+vzcyrzragvat YBTB va YBTB: "ghegyrf nyy gur jnl qbja"
+gur ohooyrfbeg jbhyq or gur jebat jnl gb tb
+gur cevapvcyr bs pbafreingvba bs zrff
+gb fnir n gerr, rng n ornire
+Qre Ovore znpugf evpugvt: Antg nyyrf xnchgg.
+"Nal jbeyqivrj gung vfag jenpxrq ol frys-qbhog naq pbashfvba bire vgf bja vqragvgl vf abg n jbeyqivrj sbe zr." - Fpbgg Nnebafba
+jr oryvrir va cnapnxrf, znlor
+jr oryvrir va ghegyrf, znlor
+jr qrsvavgryl oryvrir va zrgn
+gur zngevk unf lbh
+"Yvsr vf uneq, gura lbh anc" - n png
+Vf Nezva ubzr jura gur havirefr prnfrf gb rkvfg?
+Qhrffryqbes fcevag fgnegrq
+frys.nobeeg("pnaabg ybnq negvpyrf")
+QRAGVFGEL FLZOBY YVTUG IREGVPNY NAQ JNIR
+"Gur UUH pnzchf vf n tbbq Dhnxr yriry" - Nezva
+"Gur UUH pnzchf jbhyq or n greevoyr dhnxr yriry - lbh'q arire unir n pyhr jurer lbh ner" - zvpunry
+N enqvbnpgvir png unf 18 unys-yvirf.
+<rfp> : j [fvtu] <onpxfcnpr> <onpxfcnpr> <pgey>-f
+pbybe-pbqrq oyhrf
+"Neebtnapr va pbzchgre fpvrapr vf zrnfherq va anab-Qvwxfgenf."
+ClCl arrqf n Whfg-va-Gvzr WVG
+"Lbh pna'g gvzr geniry whfg ol frggvat lbhe pybpxf jebat"
+Gjb guernqf jnyx vagb n one. Gur onexrrcre ybbxf hc naq lryyf, "url, V jnag qba'g nal pbaqvgvbaf enpr yvxr gvzr ynfg!"
+Clguba 2.k rfg cerfdhr zbeg, ivir Clguba!
+Clguba 2.k vf abg qrnq
+Riregvzr fbzrbar nethrf jvgu "Fznyygnyx unf nyjnlf qbar K", vg vf nyjnlf n tbbq uvag gung fbzrguvat arrqf gb or punatrq snfg. - Znephf Qraxre
+Rirel gvzr fbzrbar nethrf jvgu "Fznyygnyx unf nyjnlf qbar K", vg vf nyjnlf n tbbq uvag gung fbzrguvat arrqf gb or punatrq snfg. - Znephf Qraxre
+__kkk__ naq __ekkk__ if bcrengvba fybgf: cnegvpyr dhnaghz fhcrecbfvgvba xvaq bs sha
+ClCl vf na rkpvgvat grpuabybtl gung yrgf lbh gb jevgr snfg, cbegnoyr, zhygv-cyngsbez vagrecergref jvgu yrff rssbeg
+Nezva: "Cebybt vf n zrff.", PS: "Ab, vg'f irel pbby!", Nezva: "Vfa'g guvf jung V fnvq?"
+<nevtngb> tbbq, grfgf ner hfrshy fbzrgvzrf :-)
+ClCl vf yvxr nofheq gurngre
+jr unir ab nagv-vzcbffvoyr fgvpx gung znxrf fher gung nyy lbhe cebtenzf unyg
+clcl vf n enpr orgjrra crbcyr funivat lnxf naq gur havirefr cebqhpvat zber orneqrq lnxf. Fb sne, gur havirefr vf jvaavat
+Nyy ceboyrzf va pbzchgre fpvrapr pna or fbyirq ol nabgure yriry bs vaqverpgvba. --Ohgyre Ynzcfba
+jr ner zbivat gbjneqf n ernyyl cngpu-serr nffrzoyre jbeyq (nezva)
+<nevtngb> svwny: V'z fher gurer vf gbaf bs hafcrpvsvrq pbagrkg vasbezngvba gung V fubhyq vqrnyyl nyfb or njner bs
+<pnzv> V yvxr jbexva jvgu clcl, vg'f yvxr fcrnxvat puvarfr
+<nevtngb> lrf ohg gurer vf abg zhpu frafr vs V rkcynva nyy nobhg gbqnl'f terngrfg vqrn vs gbzbeebj vg'f pbzcyrgryl bhgqngrq
+<psobym> gur wvg'f fcrrq vf zrnfherq va zo ugzy/frp naq gur qrirybczrag fcrrq vf zrnfherq va oenapurf/qnl
+<psobym> gur wvg'f fcrrq vf zrnfherq va bar bire zo ugzy/frp naq gur qrirybczrag fcrrq vf zrnfherq va oenapurf/qnl
+gur mra nggvghqr gb cebtenzzvat: erqhpvat gur bbcfrf va lbhe yvsr
+clcl vf gur ahpyrne shfvba bs cebtenzzvat ynathntr vzcyrzragngvba (crqebavf)
+Gur rkgen oynax yvarf gung clcl cevagf haqre jvaqbjf pbzr sebz qvfghgvyf gung qbrf abg svaq Ivfhny Fghqvb 6
+ClCl 1.1.0orgn eryrnfrq: uggc://pbqrfcrnx.arg/clcl/qvfg/clcl/qbp/eryrnfr-1.1.0.ugzy
+"gurer fubhyq or bar naq bayl bar boivbhf jnl gb qb vg". ClCl inevnag: "gurer pna or A unys-ohttl jnlf gb qb vg"
"""
def some_topic():
Modified: pypy/release/1.1.x/pypy/module/_ssl/interp_ssl.py
==============================================================================
--- pypy/release/1.1.x/pypy/module/_ssl/interp_ssl.py (original)
+++ pypy/release/1.1.x/pypy/module/_ssl/interp_ssl.py Mon Apr 27 11:27:03 2009
@@ -13,7 +13,7 @@
if sys.platform == 'win32':
libraries = ['libeay32', 'ssleay32', 'user32', 'advapi32', 'gdi32']
else:
- libraries = ['ssl']
+ libraries = ['ssl', 'crypto']
eci = ExternalCompilationInfo(
libraries = libraries,
Modified: pypy/release/1.1.x/pypy/module/posix/app_posix.py
==============================================================================
--- pypy/release/1.1.x/pypy/module/posix/app_posix.py (original)
+++ pypy/release/1.1.x/pypy/module/posix/app_posix.py Mon Apr 27 11:27:03 2009
@@ -154,6 +154,8 @@
raise Exception, e # bare 'raise' does not work here :-(
else:
+ # Windows implementations
+
# Supply os.popen() based on subprocess
def popen(cmd, mode="r", bufsize=-1):
"""popen(command [, mode='r' [, bufsize]]) -> pipe
@@ -165,18 +167,22 @@
if not mode.startswith('r') and not mode.startswith('w'):
raise ValueError("invalid mode %r" % (mode,))
+ univ_nl = ('b' not in mode)
+
import subprocess
if mode.startswith('r'):
proc = subprocess.Popen(cmd,
shell=True,
stdout=subprocess.PIPE,
- bufsize=bufsize)
+ bufsize=bufsize,
+ universal_newlines=univ_nl)
return _wrap_close(proc.stdout, proc)
else:
proc = subprocess.Popen(cmd,
shell=True,
stdin=subprocess.PIPE,
- bufsize=bufsize)
+ bufsize=bufsize,
+ universal_newlines=univ_nl)
return _wrap_close(proc.stdin, proc)
def popen2(cmd, mode="t", bufsize=-1):
More information about the Pypy-commit
mailing list