Merge remote-tracking branch 'origin/pr/32'

This commit is contained in:
Martin Zimmermann 2013-11-10 12:42:59 +01:00
commit 80aaf15128

View File

@ -14,7 +14,10 @@ from string import ascii_letters, digits
from werkzeug.wrappers import Request from werkzeug.wrappers import Request
from werkzeug.exceptions import BadRequest from werkzeug.exceptions import BadRequest
try:
import ipaddress import ipaddress
except ImportError:
import ipaddr as ipaddress
def anonymize(remote_addr): def anonymize(remote_addr):