diff --git a/py3donate.html b/py3donate.html index 4f1b887d324adf2a2a15b15d5ea907afa9625deb_cHkzZG9uYXRlLmh0bWw=..aaad0c26150d3372a1df298fe9190cda387d2247_cHkzZG9uYXRlLmh0bWw= 100644 --- a/py3donate.html +++ b/py3donate.html @@ -60,7 +60,7 @@ necessary work, to make it happen faster. <a class="reference internal" href="#here">Here</a> is a more detailed view on how our proposed work benefits the Python community and the general public.</p> <p>Below you'll find the <a class="reference internal" href="#planned-stages-of-work">planned stages of work</a> and the associated fundraising targets we need to make things happen. Once we reach the -neccessary target for each stage, we will start contracting +necessary target for each stage, we will start contracting developers. Contracts and money are managed by the non-profit <a class="reference external" href="http://sfconservancy.org/">Software Freedom Conservancy</a> of which the PyPy project is a member. The current elected representatives are Carl Friedrich Bolz, Holger @@ -86,8 +86,8 @@ <div class="section" id="id1"> <span id="planned-stages-of-work"></span><h1>Planned stages of work</h1> <p>The goal of this project is to write an interpreter that interprets -version 3 of Python language. To be precise we would aim at having -Python 3.2 interpreter together in the same codebase as python 2.7 +version 3 of the Python language. To be precise we would aim at having +a Python 3.2 interpreter together in the same codebase as the python 2.7 one.</p> <p>At the end of the project, it will be possible to decide at translation time whether to build an interpreter which supports Python @@ -97,7 +97,10 @@ particular, it might be possible that the resulting Python 3 interpreter will be slower than the Python 2 one. If needed, optimizing and making it more JIT friendly will be the scope of a -separate project.</p> +separate project. Our existing JIT generation technology should apply +out of the box; this disclaimer is only about the extra performance we +could obtain by tweaking the Python 3 interpreter or writing specific +interpreter-guided optimizations in the JIT.</p> <div class="section" id="about-estimates-and-costs"> <h2>About estimates and costs</h2> <p>For each step, we estimated the time that it would take to complete for an @@ -142,10 +145,10 @@ </ul> </blockquote> </li> -<li><dl class="first docutils"> -<dt><strong>Sub-step 1.2</strong>: other syntactic changes, builtin types and functions,</dt> -<dd><p class="first">exceptions:</p> -<ul class="last simple"> +<li><p class="first"><strong>Sub-step 1.2</strong>: other syntactic changes, builtin types and functions, +exceptions:</p> +<blockquote> +<ul class="simple"> <li>views and iterators instead of lists (e.g., <tt class="docutils literal">dict.items()</tt>, <tt class="docutils literal">map</tt>, <tt class="docutils literal">range</tt> & co.)</li> <li>new rules for ordering comparisons</li> @@ -160,8 +163,7 @@ <li>improved <tt class="docutils literal">with</tt> statement</li> <li><strong>Estimate cost</strong>: $26,000</li> </ul> -</dd> -</dl> +</blockquote> </li> </ul> <p>Note that the distinction between sub-steps 1.1 and 1.2 is blurry, and it might be @@ -212,8 +214,8 @@ The increased execution speed that PyPy provides has attracted many users, who now find their Python code runs up to four times faster under PyPy than under the reference implementation written in C. Some programs that -are particularly JIT-friendly see even greater speedups.</p> -<p><span class="target" id="speed">speed</span>: <a class="reference external" href="http://speed.pypy.org">http://speed.pypy.org</a></p> +are particularly JIT-friendly see even greater speedups. See our <a class="reference external" href="http://speed.pypy.org">speed</a> +website.</p> <p>Meanwhile, the Python community is undergoing significant change, with the introduction of a new ‘version 3’ of the Python language (Python 3). Python 3 breaks some backwards compatibility with 2.x series, so @@ -278,57 +280,6 @@ </div> </div> <div id="sidebar"> -<ul> - <li> - <div class="sidepic"> - <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> -<input type="hidden" name="cmd" value="_s-xclick" /> -<input type="hidden" name="hosted_button_id" value="J268ZTLRE2BW8" /> -<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" /> -<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" /> -</form> - </div> - </li> - <li> - <div class="sidepic"> -<script type="text/javascript"> -function validateAmount(amount){ - if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ - return true; - }else{ - alert('You must enter a valid donation.'); - amount.focus(); - return false; - } -} -</script> -<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top"> - <input name="item_name_1" type="hidden" value="PyPy Directed Donation via Software Freedom Conservancy, Inc." /> - <input name="item_description_1" type="hidden" value="This is a donation to the Software Freedom Conservancy, Inc. The donation will be directed for the PyPy project." /> - <input name="item_quantity_1" type="hidden" value="1" /> - <input name="item_currency_1" type="hidden" value="USD" /> - <input name="item_is_modifiable_1" type="hidden" value="true" /> - <input name="item_min_price_1" type="hidden" value="5.0" /> - <input name="item_max_price_1" type="hidden" value="25000.0" /> - <input name="_charset_" type="hidden" value="utf-8" /> - <table cellpadding="5" cellspacing="0" width="1%"> - <tr> - <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount" /> - </td> - <td align="left" width="1%"> - <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image" /> - </td> - </tr> - </table> -</form> - </div> - </li> - <li> - <div class="sidepic"> - <a id="main_download" href="download.html">Download PyPy</a> - </div> - </li> -</ul> </div> </div> </div> diff --git a/source/_layouts/py3k.genshi b/source/_layouts/py3k.genshi new file mode 100644 index 0000000000000000000000000000000000000000..aaad0c26150d3372a1df298fe9190cda387d2247_c291cmNlL19sYXlvdXRzL3B5M2suZ2Vuc2hp --- /dev/null +++ b/source/_layouts/py3k.genshi @@ -0,0 +1,19 @@ +--- +layout: site +license: MIT +--- + +<div xmlns:py="http://genshi.edgewall.org/"> +<div id="main"> +<h1 class="title" py:if="defined('title')">${Markup(title)}</h1> +${Markup(content)} +</div> +<div id="sidebar"> +<py:if test="defined('__by__')"> +<h3>Meta</h3> +<div class="sidebar-text"> +This page was last updated by <a href="mailto:${__by__}">${__by__.split('@')[0] or 'unknown'}</a> on ${__updated__.strftime('%B %d, %Y')} @ <a href="http://github.com/tav/pypy-site/commits/master/${__id__}">${__updated__.strftime('%H:%M')}</a> <a href="http://github.com/tav/ampify/raw/master/LICENSE"><img src="http://static.ampify.it/gfx.public-domain.png" width="20px" height="20px" alt="Public Domain" class="absmiddle" /></a> +</div> +</py:if> +</div> +</div> diff --git a/source/py3donate.txt b/source/py3donate.txt index 4f1b887d324adf2a2a15b15d5ea907afa9625deb_c291cmNlL3B5M2RvbmF0ZS50eHQ=..aaad0c26150d3372a1df298fe9190cda387d2247_c291cmNlL3B5M2RvbmF0ZS50eHQ= 100644 --- a/source/py3donate.txt +++ b/source/py3donate.txt @@ -1,5 +1,5 @@ --- -layout: page +layout: py3k title: (UNRELEASED DRAFT) Call for donations - PyPy to support Python3! ---