X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FMLRsearch%2FReceiveRateInterval.py;h=eff23e8bcc6f6161e94a584bfa42879a942da8ae;hb=79f5ba9bf7656972dd988508eff9465562dde42c;hp=6dff1b8a7aec288aab716a58d33edfbe70e92691;hpb=56fe9e512019d90a5647f4a244ffb8b6f6ff9c47;p=csit.git

diff --git a/resources/libraries/python/MLRsearch/ReceiveRateInterval.py b/resources/libraries/python/MLRsearch/ReceiveRateInterval.py
index 6dff1b8a7a..eff23e8bcc 100644
--- a/resources/libraries/python/MLRsearch/ReceiveRateInterval.py
+++ b/resources/libraries/python/MLRsearch/ReceiveRateInterval.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -15,10 +15,10 @@
 
 import math
 
-from ReceiveRateMeasurement import ReceiveRateMeasurement
+from .ReceiveRateMeasurement import ReceiveRateMeasurement
 
 
-class ReceiveRateInterval(object):
+class ReceiveRateInterval:
     """Structure defining two Rr measurements, and their relation."""
 
     def __init__(self, measured_low, measured_high):
@@ -32,11 +32,15 @@ class ReceiveRateInterval(object):
         # TODO: Type checking is not very pythonic,
         # perhaps users can fix wrong usage without it?
         if not isinstance(measured_low, ReceiveRateMeasurement):
-            raise TypeError("measured_low is not a ReceiveRateMeasurement: "
-                            "{low!r}".format(low=measured_low))
+            raise TypeError(
+                f"measured_low is not a ReceiveRateMeasurement: "
+                f"{measured_low!r}"
+            )
         if not isinstance(measured_high, ReceiveRateMeasurement):
-            raise TypeError("measured_high is not a ReceiveRateMeasurement: "
-                            "{high!r}".format(high=measured_high))
+            raise TypeError(
+                f"measured_high is not a ReceiveRateMeasurement: "
+                f"{measured_high!r}"
+            )
         self.measured_low = measured_low
         self.measured_high = measured_high
         # Declare secondary quantities to appease pylint.
@@ -50,9 +54,11 @@ class ReceiveRateInterval(object):
         """Sort bounds by target Tr, compute secondary quantities."""
         if self.measured_low.target_tr > self.measured_high.target_tr:
             self.measured_low, self.measured_high = (
-                self.measured_high, self.measured_low)
+                self.measured_high, self.measured_low
+            )
         self.abs_tr_width = (
-            self.measured_high.target_tr - self.measured_low.target_tr)
+            self.measured_high.target_tr - self.measured_low.target_tr
+        )
         self.rel_tr_width = self.abs_tr_width / self.measured_high.target_tr
 
     def width_in_goals(self, relative_width_goal):
@@ -74,11 +80,9 @@ class ReceiveRateInterval(object):
 
     def __str__(self):
         """Return string as half-open interval."""
-        return "[{low!s};{high!s})".format(
-            low=self.measured_low, high=self.measured_high)
+        return f"[{self.measured_low!s};{self.measured_high!s})"
 
     def __repr__(self):
         """Return string evaluable as a constructor call."""
-        return ("ReceiveRateInterval(measured_low={low!r}"
-                ",measured_high={high!r})".format(
-                    low=self.measured_low, high=self.measured_high))
+        return f"ReceiveRateInterval(measured_low={self.measured_low!r}," \
+            f"measured_high={self.measured_high!r})"