aboutsummaryrefslogtreecommitdiff
path: root/rpki/rpkic.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2015-11-11 03:22:38 +0000
committerRob Austein <sra@hactrn.net>2015-11-11 03:22:38 +0000
commit9f6d6462a9cef37735a9d4c61921d04934fd9864 (patch)
treee5d1b046f6f6bd44faf1b5028f6f1df9698e2a88 /rpki/rpkic.py
parentac415cdd0f88f8479975627772dd0a84797b261a (diff)
Configure pylint to use the pylint-django plugin, which (mostly)
understands Django's exotic metaclasses, which in turn allows us to re-enable a number of pylint checks we had disabled. While we were at this, stripped out a bunch of old pylint pragmas, then added back the subset that were really needed. As usual with pylint, this turned up a few real bugs along with an awful lot of noise. svn path=/branches/tk705/; revision=6162
Diffstat (limited to 'rpki/rpkic.py')
-rw-r--r--rpki/rpkic.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/rpki/rpkic.py b/rpki/rpkic.py
index 9cde75fb..7d63bbe7 100644
--- a/rpki/rpkic.py
+++ b/rpki/rpkic.py
@@ -115,7 +115,10 @@ class main(Cmd):
args.func(self, args)
def read_config(self):
- global rpki # pylint: disable=W0602
+
+ # pylint: disable=W0201,W0602,W0621
+
+ global rpki
try:
cfg = rpki.config.parser(set_filename = self.cfg_file, section = "myrpki")
@@ -131,7 +134,7 @@ class main(Cmd):
import django
django.setup()
- import rpki.irdb # pylint: disable=W0621
+ import rpki.irdb
try:
rpki.irdb.models.ca_certificate_lifetime = rpki.sundial.timedelta.parse(
@@ -582,7 +585,7 @@ class main(Cmd):
Show resources received by this entity from its parent(s).
"""
- q_msg = self.zoo._compose_left_right_query()
+ q_msg = self.zoo.compose_left_right_query()
SubElement(q_msg, rpki.left_right.tag_list_received_resources, tenant_handle = self.zoo.handle)
for r_pdu in self.zoo.call_rpkid(q_msg):
@@ -604,7 +607,7 @@ class main(Cmd):
Show published objects.
"""
- q_msg = self.zoo._compose_left_right_query()
+ q_msg = self.zoo.compose_left_right_query()
SubElement(q_msg, rpki.left_right.tag_list_published_objects, tenant_handle = self.zoo.handle)
for r_pdu in self.zoo.call_rpkid(q_msg):