Skip to content

powerdns: do not import urllib2 unconditionally #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

powerdns: do not import urllib2 unconditionally #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions nixstatsagent/plugins/powerdns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from urllib2 import urlopen, Request
import time
import plugins
import urllib2
import json

class Plugin(plugins.BasePlugin):
Expand All @@ -26,7 +25,7 @@ def run(self, config):
;timeout=10
'''
# Create request to configured URL
request = urllib2.Request(config.get(__name__, 'statistics_url'), headers={'X-API-Key': '%s' % config.get(__name__, 'api_key')})
request = Request(config.get(__name__, 'statistics_url'), headers={'X-API-Key': '%s' % config.get(__name__, 'api_key')})
# defaults
timeout = 10
results = dict()
Expand All @@ -39,11 +38,11 @@ def run(self, config):
timeout = int(config.get(__name__, 'timeout'))
# create response based on configuration
if config.has_option(__name__, 'ca_file'):
raw_response = urllib2.urlopen(request, timeout=timeout, cafile=config.get(__name__, 'ca_file'))
raw_response = urlopen(request, timeout=timeout, cafile=config.get(__name__, 'ca_file'))
elif config.has_option(__name__, 'ca_path'):
raw_response = urllib2.urlopen(request, timeout=timeout, capath=config.get(__name__, 'ca_path'))
raw_response = urlopen(request, timeout=timeout, capath=config.get(__name__, 'ca_path'))
else:
raw_response = urllib2.urlopen(request, timeout=timeout)
raw_response = urlopen(request, timeout=timeout)
# set next_cache timestamp
next_cache['ts'] = time.time()
# parse raw response as JSON
Expand Down