Revision 8d86738e
vigigraph: corrections pylint
Change-Id: Ic23f753818b5f715150815a2f5f212a528ad7c58
vigigraph/config/app_cfg.py | ||
---|---|---|
16 | 16 |
|
17 | 17 |
import vigigraph |
18 | 18 |
from vigilo.turbogears import VigiloAppConfig |
19 |
from vigigraph.lib import app_globals, helpers |
|
20 | 19 |
|
21 | 20 |
base_config = VigiloAppConfig('vigigraph') |
22 | 21 |
base_config.package = vigigraph |
vigigraph/controllers/root.py | ||
---|---|---|
5 | 5 |
|
6 | 6 |
"""Vigigraph Controller""" |
7 | 7 |
|
8 |
# pylint: disable-msg=W0613 |
|
9 |
# W0613: Unused argument : les arguments des contrôleurs sont les composants |
|
10 |
# de la query-string de l'URL |
|
11 |
|
|
12 |
|
|
8 | 13 |
import logging |
9 |
from tg import expose, flash, require, request, redirect
|
|
10 |
from pylons.i18n import ugettext as _, lazy_ugettext as l_, get_lang
|
|
14 |
from tg import expose, require
|
|
15 |
from pylons.i18n import lazy_ugettext as l_, get_lang |
|
11 | 16 |
from repoze.what.predicates import Any, All, not_anonymous, \ |
12 | 17 |
has_permission, in_group |
13 | 18 |
from pkg_resources import resource_filename |
vigigraph/controllers/rpc.py | ||
---|---|---|
4 | 4 |
|
5 | 5 |
"""RPC controller for the combobox of vigigraph""" |
6 | 6 |
|
7 |
import time, urlparse, urllib2 |
|
7 |
# pylint: disable-msg=W0613 |
|
8 |
# W0613: Unused argument : les arguments des contrôleurs sont les composants |
|
9 |
# de la query-string de l'URL |
|
10 |
|
|
11 |
|
|
12 |
import time |
|
13 |
import urllib2 |
|
8 | 14 |
import logging |
9 | 15 |
|
10 |
# La fonction parse_qsl a été déplacée dans Python 2.6. |
|
11 |
try: |
|
12 |
from urlparse import parse_qsl |
|
13 |
except ImportError: |
|
14 |
from cgi import parse_qsl |
|
16 |
## La fonction parse_qsl a été déplacée dans Python 2.6.
|
|
17 |
#try:
|
|
18 |
# from urlparse import parse_qsl
|
|
19 |
#except ImportError:
|
|
20 |
# from cgi import parse_qsl
|
|
15 | 21 |
|
16 | 22 |
from pylons.i18n import ugettext as _, lazy_ugettext as l_ |
17 |
from webob.exc import HTTPPreconditionFailed |
|
18 | 23 |
from tg import expose, request, redirect, tmpl_context, \ |
19 | 24 |
config, validate, flash, exceptions as http_exc |
20 | 25 |
|
... | ... | |
22 | 27 |
in_group, Any, All |
23 | 28 |
from formencode import schema |
24 | 29 |
from tw.forms import validators |
25 |
from sqlalchemy import or_ |
|
26 |
from sqlalchemy.sql.expression import literal_column |
|
27 | 30 |
from sqlalchemy.orm import aliased, lazyload |
28 | 31 |
|
29 | 32 |
from vigilo.turbogears.controllers import BaseController |
... | ... | |
77 | 80 |
{"caption" : _("Last year"), "duration" : 86400 * 365}, |
78 | 81 |
] |
79 | 82 |
|
80 |
def process_form_errors(self, *argv, **kwargv):
|
|
83 |
def process_form_errors(self, *args, **kwargs):
|
|
81 | 84 |
""" |
82 | 85 |
Gestion des erreurs de validation : On affiche les erreurs |
83 | 86 |
puis on redirige vers la dernière page accédée. |
... | ... | |
220 | 223 |
try: |
221 | 224 |
host = kwargs['graphs[%d][host]' % i] |
222 | 225 |
graph = kwargs['graphs[%d][graph]' % i] |
223 |
start = int(kwargs.get('graphs[%d][start]' % i, time.time() - 86400)) |
|
226 |
start = int(kwargs.get('graphs[%d][start]' % i, |
|
227 |
time.time() - 86400)) |
|
224 | 228 |
duration = int(kwargs.get('graphs[%d][duration]' % i)) |
225 | 229 |
nocache = kwargs['graphs[%d][nocache]' % i] |
226 | 230 |
except KeyError: |
... | ... | |
329 | 333 |
@type host : C{str} |
330 | 334 |
@param start : date-heure de debut des donnees |
331 | 335 |
@type start : C{str} |
332 |
@param duration : plage de temps des données |
|
336 |
@param duration : plage de temps des données. Parametre optionnel, |
|
337 |
initialisé a 86400 = plage de 1 jour. |
|
333 | 338 |
@type duration : C{str} |
334 |
(parametre optionnel, initialise a 86400 = plage de 1 jour) |
|
335 | 339 |
|
336 |
@return: page avec les images des graphes et boutons de deplacement dans le temps |
|
340 |
@return: page avec les images des graphes et boutons de deplacement |
|
341 |
dans le temps |
|
337 | 342 |
@rtype: page html |
338 | 343 |
""" |
339 | 344 |
if start is None: |
... | ... | |
477 | 482 |
if not is_manager: |
478 | 483 |
direct_access = False |
479 | 484 |
user = get_current_user() |
485 |
# pylint: disable-msg=W0212 |
|
486 |
# W0212: Access to a protected member _grouptype of a client class |
|
480 | 487 |
|
481 | 488 |
# On calcule la distance de ce groupe par rapport aux groupes |
482 | 489 |
# sur lesquels l'utilisateur a explicitement les permissions. |
... | ... | |
495 | 502 |
GroupHierarchy.hops |
496 | 503 |
).join( |
497 | 504 |
(Group, Group.idgroup == GroupHierarchy.idparent), |
498 |
(DataPermission, DataPermission.idgroup == Group.idgroup), |
|
499 |
(UserGroup, UserGroup.idgroup == DataPermission.idusergroup), |
|
505 |
(DataPermission, |
|
506 |
DataPermission.idgroup == Group.idgroup), |
|
507 |
(UserGroup, |
|
508 |
UserGroup.idgroup == DataPermission.idusergroup), |
|
500 | 509 |
(USER_GROUP_TABLE, USER_GROUP_TABLE.c.idgroup == \ |
501 | 510 |
UserGroup.idgroup), |
502 | 511 |
).filter(USER_GROUP_TABLE.c.username == user.user_name |
... | ... | |
510 | 519 |
GroupHierarchy.hops |
511 | 520 |
).join( |
512 | 521 |
(Group, Group.idgroup == GroupHierarchy.idchild), |
513 |
(DataPermission, DataPermission.idgroup == Group.idgroup), |
|
514 |
(UserGroup, UserGroup.idgroup == DataPermission.idusergroup), |
|
522 |
(DataPermission, |
|
523 |
DataPermission.idgroup == Group.idgroup), |
|
524 |
(UserGroup, |
|
525 |
UserGroup.idgroup == DataPermission.idusergroup), |
|
515 | 526 |
(USER_GROUP_TABLE, USER_GROUP_TABLE.c.idgroup == \ |
516 | 527 |
UserGroup.idgroup), |
517 | 528 |
).filter(USER_GROUP_TABLE.c.username == user.user_name |
... | ... | |
552 | 563 |
# des fils de l'un de ces groupes. |
553 | 564 |
db_groups = db_groups.join( |
554 | 565 |
(gh2, gh2.idparent == gh1.idchild), |
555 |
(DataPermission, DataPermission.idgroup == gh2.idchild), |
|
556 |
(UserGroup, UserGroup.idgroup == DataPermission.idusergroup), |
|
557 |
(USER_GROUP_TABLE, USER_GROUP_TABLE.c.idgroup == UserGroup.idgroup), |
|
566 |
(DataPermission, |
|
567 |
DataPermission.idgroup == gh2.idchild), |
|
568 |
(UserGroup, |
|
569 |
UserGroup.idgroup == DataPermission.idusergroup), |
|
570 |
(USER_GROUP_TABLE, |
|
571 |
USER_GROUP_TABLE.c.idgroup == UserGroup.idgroup), |
|
558 | 572 |
).filter(USER_GROUP_TABLE.c.username == user.user_name) |
559 | 573 |
|
560 | 574 |
num_children_left = db_groups.count() - offset |
... | ... | |
627 | 641 |
if host_id is None: |
628 | 642 |
return dict(groups = [], graphs=[]) |
629 | 643 |
|
630 |
limit = int(config.get("max_menu_entries", 20)) |
|
631 | 644 |
# On vérifie les permissions sur l'hôte |
632 | 645 |
# TODO: Utiliser un schéma de validation |
633 | 646 |
host_id = int(host_id) |
vigigraph/tests/functional/test_fullhostpage.py | ||
---|---|---|
11 | 11 |
|
12 | 12 |
from vigigraph.tests import TestController |
13 | 13 |
from vigilo.models.session import DBSession |
14 |
from vigilo.models.tables import Host, SupItemGroup, Graph, GraphGroup |
|
15 |
from helpers import populateDB, addGraphs |
|
14 |
from vigigraph.tests.functional.helpers import populateDB, addGraphs |
|
16 | 15 |
|
17 | 16 |
|
18 | 17 |
class TestFullHostPage(TestController): |
... | ... | |
89 | 88 |
def test_anonymous(self): |
90 | 89 |
"""Accès à rpc/fullHostPage en anonyme""" |
91 | 90 |
for host in (u'host1 éà', u'host2 éà', u'host3 éà'): |
92 |
response = self.app.get(
|
|
91 |
self.app.get( |
|
93 | 92 |
'/rpc/fullHostPage?host=%s' % |
94 | 93 |
urllib2.quote(host.encode('utf-8'), ''), |
95 | 94 |
status=401 |
vigigraph/tests/functional/test_graph_selection_form.py | ||
---|---|---|
10 | 10 |
from vigigraph.tests import TestController |
11 | 11 |
from vigilo.models.session import DBSession |
12 | 12 |
from vigilo.models.tables import Host, Graph, GraphGroup |
13 |
from helpers import populateDB, addGraphs |
|
13 |
from vigigraph.tests.functional.helpers import populateDB, addGraphs
|
|
14 | 14 |
|
15 | 15 |
|
16 | 16 |
class TestGraphTree(TestController): |
vigigraph/tests/functional/test_host_selection_form.py | ||
---|---|---|
9 | 9 |
|
10 | 10 |
from vigigraph.tests import TestController |
11 | 11 |
from vigilo.models.session import DBSession |
12 |
from vigilo.models.tables import Host, SupItemGroup, Permission
|
|
13 |
from helpers import populateDB |
|
12 |
from vigilo.models.tables import Host, SupItemGroup |
|
13 |
from vigigraph.tests.functional.helpers import populateDB
|
|
14 | 14 |
|
15 | 15 |
class TestHostTree(TestController): |
16 | 16 |
""" |
vigigraph/tests/functional/test_opensearch.py | ||
---|---|---|
10 | 10 |
|
11 | 11 |
from vigigraph.tests import TestController |
12 | 12 |
from vigilo.models.session import DBSession |
13 |
from vigilo.models.tables import Host, SupItemGroup, Graph, GraphGroup |
|
14 |
from helpers import populateDB, addGraphs |
|
13 |
from vigigraph.tests.functional.helpers import populateDB, addGraphs |
|
15 | 14 |
|
16 | 15 |
|
17 | 16 |
class TestOpenSearch(TestController): |
... | ... | |
85 | 84 |
def test_anonymous(self): |
86 | 85 |
"""OpenSearch en anonyme""" |
87 | 86 |
for host in (u'host1 éà', u'host2 éà', u'host3 éà'): |
88 |
response = self.app.get(
|
|
87 |
self.app.get( |
|
89 | 88 |
'/rpc/fullHostPage?host=%s' % |
90 | 89 |
urllib2.quote(host.encode('utf-8'), ''), |
91 | 90 |
status=401 |
vigigraph/tests/functional/test_search_form.py | ||
---|---|---|
10 | 10 |
from vigigraph.tests import TestController |
11 | 11 |
from vigilo.models.session import DBSession |
12 | 12 |
from vigilo.models.tables import Host, SupItemGroup, Graph, GraphGroup |
13 |
from helpers import populateDB, addGraphs |
|
13 |
from vigigraph.tests.functional.helpers import populateDB, addGraphs
|
|
14 | 14 |
|
15 | 15 |
|
16 | 16 |
class TestSearchForm(TestController): |
... | ... | |
41 | 41 |
""" |
42 | 42 |
|
43 | 43 |
# Récupération du groupe d'hôtes 'mhg' dans la base de données |
44 |
mainhostgroup = DBSession.query(SupItemGroup).filter(
|
|
44 |
DBSession.query(SupItemGroup).filter( |
|
45 | 45 |
SupItemGroup.name == u'mhg').first() |
46 | 46 |
|
47 | 47 |
# Récupération du groupe d'hôtes 'hg1' dans la base de données |
48 |
hostgroup1 = DBSession.query(SupItemGroup).filter(
|
|
48 |
DBSession.query(SupItemGroup).filter( |
|
49 | 49 |
SupItemGroup.name == u'hg1').first() |
50 | 50 |
|
51 | 51 |
# Récupération de l'hôte 'host1' dans la base de données |
... | ... | |
334 | 334 |
""" |
335 | 335 |
|
336 | 336 |
# Récupération du groupe d'hôtes 'mhg' dans la base de données |
337 |
mainhostgroup = DBSession.query(SupItemGroup).filter(
|
|
337 |
DBSession.query(SupItemGroup).filter( |
|
338 | 338 |
SupItemGroup.name == u'mhg').first() |
339 | 339 |
|
340 | 340 |
# Récupération du groupe d'hôtes 'hg1' dans la base de données |
341 |
hostgroup1 = DBSession.query(SupItemGroup).filter(
|
|
341 |
DBSession.query(SupItemGroup).filter( |
|
342 | 342 |
SupItemGroup.name == u'hg1').first() |
343 | 343 |
|
344 | 344 |
# Récupération de l'hôte 'host1' dans la base de données |
... | ... | |
351 | 351 |
|
352 | 352 |
# Récupération du groupe de graphes |
353 | 353 |
# 'graphgroup1' dans la base de données |
354 |
graphgroup1 = DBSession.query(GraphGroup).filter(
|
|
354 |
DBSession.query(GraphGroup).filter( |
|
355 | 355 |
GraphGroup.name == u'graphgroup1').first() |
356 | 356 |
|
357 | 357 |
# Récupération du groupe de graphes |
358 | 358 |
# 'graphgroup2' dans la base de données |
359 |
graphgroup2 = DBSession.query(GraphGroup).filter(
|
|
359 |
DBSession.query(GraphGroup).filter( |
|
360 | 360 |
GraphGroup.name == u'graphgroup2').first() |
361 | 361 |
|
362 | 362 |
# Récupération du graphe 'graph1' dans la base de données |
vigigraph/websetup.py | ||
---|---|---|
1 | 1 |
# -*- coding: utf-8 -*- |
2 | 2 |
"""Setup the vigigraph application""" |
3 | 3 |
|
4 |
# pylint: disable-msg=W0613 |
|
5 |
# W0613: Unused argument |
|
6 |
|
|
4 | 7 |
__all__ = ['setup_app', 'populate_db'] |
5 | 8 |
|
6 | 9 |
def setup_app(command, conf, variables): |
Also available in: Unified diff