changeset: 78152:d896fd0a8ba7
branch: 3.2
parent: 78142:71537aba3a0a
user: Eli Bendersky <eliben@gmail.com>
date: Tue Jul 17 14:20:38 2012 +0300
files: Modules/_elementtree.c
description:
ISsue #14988: restore Python 2's behavior of raising ImportError when unable to load pyexpat, instead of a SystemError/RuntimeError
diff -r 71537aba3a0a -r d896fd0a8ba7 Modules/_elementtree.c
--- a/Modules/_elementtree.c	Mon Jul 16 15:48:30 2012 -0700
+++ b/Modules/_elementtree.c	Tue Jul 17 14:20:38 2012 +0300
@@ -3117,6 +3117,8 @@
 expat_capi->MICRO_VERSION != XML_MICRO_VERSION)
 expat_capi = NULL;
 }
+ if (!expat_capi)
+ return NULL;
 #endif
 
 elementtree_parseerror_obj = PyErr_NewException(
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/d896fd0a8ba7">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/d896fd0a8ba7" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>