Skip to content

Fix python3 deprecation warnings #585

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

Merged
brian-brazil merged 2 commits into from
Oct 2, 2020
Merged

Fix python3 deprecation warnings #585

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94b4e86
Change assertEquals to assertEqual due to deprecation
yzdann Oct 2, 2020
eeee370
Change import getargspec from prometheus_client.decorator to fix depr…
yzdann Oct 2, 2020
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
18 changes: 9 additions & 9 deletions tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from __future__ import unicode_literals

from concurrent.futures import ThreadPoolExecutor
import inspect
import time

import pytest
Expand All @@ -12,6 +11,7 @@
HistogramMetricFamily, Info, InfoMetricFamily, Metric, Sample,
StateSetMetricFamily, Summary, SummaryMetricFamily, UntypedMetricFamily,
)
from prometheus_client.decorator import getargspec

try:
import unittest2 as unittest
Expand Down Expand Up @@ -46,7 +46,7 @@ def f(r):
else:
raise TypeError

self.assertEqual((["r"], None, None, None), inspect.getargspec(f))
self.assertEqual((["r"], None, None, None), getargspec(f))

try:
f(False)
Expand Down Expand Up @@ -107,7 +107,7 @@ def test_inprogress_function_decorator(self):
def f():
self.assertEqual(1, self.registry.get_sample_value('g'))

self.assertEqual(([], None, None, None), inspect.getargspec(f))
self.assertEqual(([], None, None, None), getargspec(f))

f()
self.assertEqual(0, self.registry.get_sample_value('g'))
Expand All @@ -134,7 +134,7 @@ def test_time_function_decorator(self):
def f():
time.sleep(.001)

self.assertEqual(([], None, None, None), inspect.getargspec(f))
self.assertEqual(([], None, None, None), getargspec(f))

f()
self.assertNotEqual(0, self.registry.get_sample_value('g'))
Expand Down Expand Up @@ -204,7 +204,7 @@ def test_function_decorator(self):
def f():
pass

self.assertEqual(([], None, None, None), inspect.getargspec(f))
self.assertEqual(([], None, None, None), getargspec(f))

f()
self.assertEqual(1, self.registry.get_sample_value('s_count'))
Expand Down Expand Up @@ -345,7 +345,7 @@ def test_function_decorator(self):
def f():
pass

self.assertEqual(([], None, None, None), inspect.getargspec(f))
self.assertEqual(([], None, None, None), getargspec(f))

f()
self.assertEqual(1, self.registry.get_sample_value('h_count'))
Expand Down Expand Up @@ -753,7 +753,7 @@ def test_restricted_registry(self):

m = Metric('s', 'help', 'summary')
m.samples = [Sample('s_sum', {}, 7)]
self.assertEquals([m], registry.restricted_registry(['s_sum']).collect())
self.assertEqual([m], registry.restricted_registry(['s_sum']).collect())

def test_target_info_injected(self):
registry = CollectorRegistry(target_info={'foo': 'bar'})
Expand All @@ -777,11 +777,11 @@ def test_target_info_restricted_registry(self):

m = Metric('s', 'help', 'summary')
m.samples = [Sample('s_sum', {}, 7)]
self.assertEquals([m], registry.restricted_registry(['s_sum']).collect())
self.assertEqual([m], registry.restricted_registry(['s_sum']).collect())

m = Metric('target', 'Target metadata', 'info')
m.samples = [Sample('target_info', {'foo': 'bar'}, 1)]
self.assertEquals([m], registry.restricted_registry(['target_info']).collect())
self.assertEqual([m], registry.restricted_registry(['target_info']).collect())


if __name__ == '__main__':
Expand Down