move total_seconds to utilities

This commit is contained in:
Martin Zimmermann 2014-06-28 12:21:58 +02:00
parent a551271743
commit 1e542e612a
2 changed files with 7 additions and 9 deletions

View File

@ -9,16 +9,12 @@ import datetime
from email.utils import parseaddr, formataddr
from configparser import ConfigParser
from isso.utils import total_seconds
from isso.compat import text_type as str
logger = logging.getLogger("isso")
# Python 2.6 compatibility
def total_seconds(td):
return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
def timedelta(string):
"""
Parse :param string: into :class:`datetime.timedelta`, you can use any
@ -95,10 +91,7 @@ class IssoParser(ConfigParser):
except ValueError:
return super(IssoParser, self).getint(section, key)
else:
try:
return int(delta.total_seconds())
except AttributeError:
return int(total_seconds(delta))
return int(total_seconds(delta))
def getlist(self, section, key):
return list(map(str.strip, self.get(section, key).split(',')))

View File

@ -17,6 +17,11 @@ except ImportError:
import ipaddr as ipaddress
# Python 2.6 compatibility
def total_seconds(td):
return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
def anonymize(remote_addr):
"""
Anonymize IPv4 and IPv6 :param remote_addr: to /24 (zero'd)