changeset: 77383:4aeb5b9b62d7
parent: 77381:03b5f75ddac7
user: Hynek Schlawack <hs@ox.cx>
date: Fri Jun 08 15:21:21 2012 +0200
files: Lib/ipaddress.py
description:
#14814: Remove redundant code from ipaddress.IPv6Network
The strict checks and netmask computing don't make sense if constructed with
a ALL_ONES mask based on addresses. Also fix a bug due to mis-indentation of
a return statement in the same code block.
diff -r 03b5f75ddac7 -r 4aeb5b9b62d7 Lib/ipaddress.py
--- a/Lib/ipaddress.py	Thu Jun 07 20:04:17 2012 -0400
+++ b/Lib/ipaddress.py	Fri Jun 08 15:21:21 2012 +0200
@@ -1990,12 +1990,6 @@
 self.network_address = IPv6Address(address)
 self._prefixlen = self._max_prefixlen
 self.netmask = IPv6Address(self._ALL_ONES)
- if strict:
- if (IPv6Address(int(self.network_address) &
- int(self.netmask)) != self.network_address):
- raise ValueError('%s has host bits set' % str(self))
- self.network_address = IPv6Address(int(self.network_address) &
- int(self.netmask))
 return
 
 # Constructing from a packed address
@@ -2004,13 +1998,7 @@
 self.network_address = IPv6Address((tmp[0] << 64) &#124; tmp[1])
 self._prefixlen = self._max_prefixlen
 self.netmask = IPv6Address(self._ALL_ONES)
- if strict:
- if (IPv6Address(int(self.network_address) &
- int(self.netmask)) != self.network_address):
- raise ValueError('%s has host bits set' % str(self))
- self.network_address = IPv6Address(int(self.network_address) &
- int(self.netmask))
- return
+ return
 
 # Assume input argument to be string or any object representation
 # which converts into a formatted IP prefix string.
</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/4aeb5b9b62d7">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/4aeb5b9b62d7" 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>