jenkins-bot has submitted this change and it was merged.
Change subject: using space character instead of tab character ......................................................................
using space character instead of tab character
see http://legacy.python.org/dev/peps/pep-0008/#tabs-or-spaces
Change-Id: If83d459e048a9582b343350833e95b3265275c33 --- M apispec.py M tests/test_ipregex.py 2 files changed, 21 insertions(+), 21 deletions(-)
Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified
diff --git a/apispec.py b/apispec.py index f2d599b..9f589c7 100644 --- a/apispec.py +++ b/apispec.py @@ -118,19 +118,19 @@ rangeblocks List of range blocks reguserblocks List of blocks concerning registered users, not anons byadmin Blocks raised by a given admin - user Blocks of the given user or single IP (exact match) + user Blocks of the given user or single IP (exact match) (Only direct blocks for the given IP, not range blocks) - userfragment Blocks of the given user or single IP + userfragment Blocks of the given user or single IP You may give any part of the username. - userregex Blocks of the given user or single IP + userregex Blocks of the given user or single IP Give a regex with r'...' or ur'...' - IP Blocks of the given single IP or range (max. /16) + IP Blocks of the given single IP or range (max. /16) If you give an IP, this will return also range blocks concerning this IP (not like user()). - reason Blocks raised with the given reason (exact match) - reasonfragment Blocks raised with the given reason + reason Blocks raised with the given reason (exact match) + reasonfragment Blocks raised with the given reason You may give any part of the reason, e.g. 'andalism' - reasonregex Blocks raised with the given reason (regex) + reasonregex Blocks raised with the given reason (regex) Remarks: user-like and reason-like methods are case sensitive. Use user() and IP() whenever appropriate. They are much faster and cause less server load! diff --git a/tests/test_ipregex.py b/tests/test_ipregex.py index 1c7cacc..cca6feb 100644 --- a/tests/test_ipregex.py +++ b/tests/test_ipregex.py @@ -49,18 +49,18 @@ self.ipv6test(1, "FF02:0000:0000:0000:0000:0000:0000:0001"); self.ipv6test(1, "0000:0000:0000:0000:0000:0000:0000:0001"); self.ipv6test(1, "0000:0000:0000:0000:0000:0000:0000:0000"); - self.ipv6test(not 1, "02001:0000:1234:0000:0000:C1C0:ABCD:0876"); # extra 0 not allowed! - self.ipv6test(not 1, "2001:0000:1234:0000:00001:C1C0:ABCD:0876"); # extra 0 not allowed! - #self.ipv6test(1, " 2001:0000:1234:0000:0000:C1C0:ABCD:0876"); # leading space - #self.ipv6test(1, "2001:0000:1234:0000:0000:C1C0:ABCD:0876"); # trailing space - #self.ipv6test(1, " 2001:0000:1234:0000:0000:C1C0:ABCD:0876 "); # leading and trailing space - self.ipv6test(not 1, "2001:0000:1234:0000:0000:C1C0:ABCD:0876 0"); # junk after valid address - self.ipv6test(not 1, "2001:0000:1234: 0000:0000:C1C0:ABCD:0876"); # internal space + self.ipv6test(not 1, "02001:0000:1234:0000:0000:C1C0:ABCD:0876"); # extra 0 not allowed! + self.ipv6test(not 1, "2001:0000:1234:0000:00001:C1C0:ABCD:0876"); # extra 0 not allowed! + #self.ipv6test(1, " 2001:0000:1234:0000:0000:C1C0:ABCD:0876"); # leading space + #self.ipv6test(1, "2001:0000:1234:0000:0000:C1C0:ABCD:0876"); # trailing space + #self.ipv6test(1, " 2001:0000:1234:0000:0000:C1C0:ABCD:0876 "); # leading and trailing space + self.ipv6test(not 1, "2001:0000:1234:0000:0000:C1C0:ABCD:0876 0"); # junk after valid address + self.ipv6test(not 1, "2001:0000:1234: 0000:0000:C1C0:ABCD:0876"); # internal space
- self.ipv6test(not 1, "3ffe:0b00:0000:0001:0000:0000:000a"); # seven segments - self.ipv6test(not 1, "FF02:0000:0000:0000:0000:0000:0000:0000:0001"); # nine segments - self.ipv6test(not 1, "3ffe:b00::1::a"); # double "::" - self.ipv6test(not 1, "::1111:2222:3333:4444:5555:6666::"); # double "::" + self.ipv6test(not 1, "3ffe:0b00:0000:0001:0000:0000:000a"); # seven segments + self.ipv6test(not 1, "FF02:0000:0000:0000:0000:0000:0000:0000:0001"); # nine segments + self.ipv6test(not 1, "3ffe:b00::1::a"); # double "::" + self.ipv6test(not 1, "::1111:2222:3333:4444:5555:6666::"); # double "::" self.ipv6test(1, "2::10"); self.ipv6test(1, "ff02::1"); self.ipv6test(1, "fe80::"); @@ -96,7 +96,7 @@ self.ipv6test(1, "1:2::"); self.ipv6test(1, "1::"); self.ipv6test(1, "1:2:3:4:5::7:8"); - self.ipv6test(not 1, "1:2:3::4:5::7:8"); # Double "::" + self.ipv6test(not 1, "1:2:3::4:5::7:8"); # Double "::" self.ipv6test(not 1, "12345::6:7:8"); self.ipv6test(1, "1:2:3:4::7:8"); self.ipv6test(1, "1:2:3::7:8"); @@ -165,8 +165,8 @@ self.ipv6test(not 1, "::3000.30.30.30"); self.ipv6test(1, "fe80::217:f2ff:254.7.237.98"); self.ipv6test(1, "::ffff:192.168.1.26"); - self.ipv6test(not 1, "2001:1:1:1:1:1:255Z255X255Y255"); # garbage instead of "." in IPv4 - self.ipv6test(not 1, "::ffff:192x168.1.26"); # ditto + self.ipv6test(not 1, "2001:1:1:1:1:1:255Z255X255Y255"); # garbage instead of "." in IPv4 + self.ipv6test(not 1, "::ffff:192x168.1.26"); # ditto self.ipv6test(1, "::ffff:192.168.1.1"); self.ipv6test(1, "0:0:0:0:0:0:13.1.68.3");# IPv4-compatible IPv6 address, full, deprecated self.ipv6test(1, "0:0:0:0:0:FFFF:129.144.52.38");# IPv4-mapped IPv6 address, full