soutade/iwla
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Update code for Python3

Browse Source
This commit is contained in:
Grégory Soutadé
2020-10-30 14:42:56 +01:00
parent 6f9622bb91
commit f457f4e390
11 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
iwla.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# Copyright Grégory Soutadé 2015
@@ -24,7 +24,7 @@ import shutil
import sys
import re
import time
import cPickle
import pickle
import gzip
import importlib
import argparse
@@ -165,12 +165,12 @@ class IWLA(object):
else:
self.logger.info('==> Start')
try:
t = gettext.translation('iwla', localedir=conf.locales_path, languages=[conf.locale], codeset='utf8')
t = gettext.translation('iwla', localedir=conf.locales_path, languages=[conf.locale])
self.logger.info('\tUsing locale %s' % (conf.locale))
except IOError:
t = gettext.NullTranslations()
self.logger.info('\tUsing default locale en_EN')
self._ = t.ugettext
self._ = t.gettext
def getVersion(self):
return IWLA.IWLA_VERSION
@@ -239,7 +239,7 @@ class IWLA(object):
def _clearDisplay(self):
self.display.clear()
return self.display
return self.display
def getDBFilename(self, time):
return os.path.join(conf.DB_ROOT, str(time.tm_year), '%02d' % (time.tm_mon), conf.DB_FILENAME)
@@ -261,7 +261,7 @@ class IWLA(object):
shutil.copy(filename, filename + '.bak')
with open(filename + '.tmp', 'wb+') as f, self._openDB(filename, 'w') as fzip:
cPickle.dump(obj, f)
pickle.dump(obj, f)
f.seek(0)
fzip.write(f.read())
os.fsync(fzip)
@@ -275,7 +275,7 @@ class IWLA(object):
res = None
with self._openDB(filename) as f:
res = cPickle.load(f)
res = pickle.load(f)
return res
def _callPlugins(self, target_root, *args):
@@ -326,7 +326,7 @@ class IWLA(object):
if not remote_addr in self.current_analysis['visits'].keys():
self._createVisitor(hit)
super_hit = self.current_analysis['visits'][remote_addr]
# Don't keep all requests for robots
if not super_hit['robot']:
@@ -336,7 +336,7 @@ class IWLA(object):
if self.hasBeenViewed(hit):
super_hit['bandwidth'][day] = super_hit['bandwidth'].get(day, 0) + int(hit['body_bytes_sent'])
super_hit['bandwidth'][0] += int(hit['body_bytes_sent'])
super_hit['last_access'] = self.meta_infos['last_time']
super_hit['last_access'] = self.meta_infos['last_time']
request = hit['extract_request']
@@ -345,7 +345,7 @@ class IWLA(object):
hit['is_page'] = self.isPage(uri)
if super_hit['robot'] or\
not self.hasBeenViewed(hit):
not self.hasBeenViewed(hit):
page_key = 'not_viewed_pages'
hit_key = 'not_viewed_hits'
else:
@@ -417,9 +417,9 @@ class IWLA(object):
def _decodeTime(self, hit):
try:
hit['time_decoded'] = time.strptime(hit['time_local'], conf.time_format)
except ValueError, e:
except ValueError as e:
if sys.version_info < (3, 2):
# Try without UTC value at the end (%z not recognized)
# Try without UTC value at the end (%z not recognized)
gmt_offset_str = hit['time_local'][-5:]
gmt_offset_hours = int(gmt_offset_str[1:3])*60*60
gmt_offset_minutes = int(gmt_offset_str[3:5])*60
@@ -482,9 +482,9 @@ class IWLA(object):
row = [0, nb_visits, stats['viewed_pages'], stats['viewed_hits'], stats['viewed_bandwidth'], stats['not_viewed_bandwidth']]
if nb_days:
average_row = map(lambda(v): int(v/nb_days), row)
average_row = map(lambda v: int(v/nb_days), row)
else:
average_row = map(lambda(v): 0, row)
average_row = map(lambda v: 0, row)
average_row[0] = self._('Average')
average_row[4] = bytesToStr(average_row[4])
@@ -592,7 +592,7 @@ class IWLA(object):
if f.endswith(ext):
self._compressFile(rootdir, f)
break
def _generateDisplay(self):
self._generateDisplayDaysStats()
self._callPlugins(conf.DISPLAY_HOOK_DIRECTORY)
@@ -658,7 +658,7 @@ class IWLA(object):
if not year in self.meta_infos['stats'].keys():
self.meta_infos['stats'][year] = {}
self.meta_infos['stats'][year][month] = duplicated_stats
self.logger.info("==> Serialize to %s" % (conf.META_PATH))
self._serialize(self.meta_infos, conf.META_PATH)
@@ -708,7 +708,7 @@ class IWLA(object):
self.analyse_started = True
else:
if not self.analyse_started and\
time.mktime(t) <= time.mktime(cur_time):
time.mktime(t) <= time.mktime(cur_time):
self.logger.debug("Not in time")
return False
self.analyse_started = True
@@ -809,7 +809,7 @@ class FileIter(object):
self.filenames = [f for f in filenames.split(',') if f]
for f in self.filenames:
if not os.path.exists(f):
print 'No such file \'%s\'' % (f)
print('No such file \'%s\'' % (f))
sys.exit(-1)
self.cur_file = None
self._openNextFile()