Bump urllib3 from 1.24.2 to 1.26.5 (#22)

* Bump urllib3 from 1.24.2 to 1.26.5 Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.24.2 to 1.26.5. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@1.24.2...1.26.5) --- updated-dependencies: - dependency-name: urllib3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Address pylint suggestions due to version jump pylint was updated from 2.4.3 to 2.8.3 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Robert Wiewel <[email protected]>
ducktec · Jun 12, 2021 · 901a7c9 · 901a7c9
1 parent 5b29180
commit 901a7c9
Show file tree

Hide file tree

Showing 7 changed files with 261 additions and 183 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/pydtnsim/backend/qsim.py b/pydtnsim/backend/qsim.py
@@ -62,10 +62,10 @@ def register_event(self, time, runner_id, function_call, arg=None):
         try:
             heapq.heappush(self.event_queue,
                            (time, runner_id, eid, function_call, arg))
-        except TypeError:
+        except TypeError as typeerr:
             raise SystemError("Time and runner_id were matching! " +
                               "Aborting! Only one entry per time and " +
-                              "runner_id allowed.")
+                              "runner_id allowed.") from typeerr
 
     def run_simulation(self, until=math.inf):
         """Run the simulation (until a certain point in time).

diff --git a/pydtnsim/contact_plan.py b/pydtnsim/contact_plan.py
@@ -355,8 +355,7 @@ def __add_legacy_dtn_tvg_data(self,
                 # end time, set the end time to the end of the simulation
                 # to prevent packets from being scheduled for the time after
                 # the simulation has ended.
-                if to_time > simulation_end_time:
-                    to_time = simulation_end_time
+                to_time = min(to_time, simulation_end_time)
 
                 contact1 = ContactIdentifier(
                     from_node=edge['vertices'][0],
@@ -426,8 +425,7 @@ def __add_dtn_tvg_data(self, data, simulation_end_time):
                 # end time, set the end time to the end of the simulation
                 # to prevent packets from being scheduled for the time after
                 # the simulation has ended.
-                if to_time > simulation_end_time:
-                    to_time = simulation_end_time
+                to_time = min(to_time, simulation_end_time)
 
                 # Transform the PCP into a FCP by converting the capacity
                 # predictions into a constant datarate (assuming that the

diff --git a/pydtnsim/monitors/monitor_notifier.py b/pydtnsim/monitors/monitor_notifier.py
@@ -13,7 +13,7 @@ class MonitorNotifier(BaseMonitor):
 
     def __init__(self, env):
         # Call parent class init method
-        super(MonitorNotifier, self).__init__(env)
+        super().__init__(env)
         self.subscribers = []
 
     def add_subscriber(self, subscriber):

diff --git a/pydtnsim/packet_generators/batch_packet_generator.py b/pydtnsim/packet_generators/batch_packet_generator.py
@@ -33,7 +33,7 @@ class BatchPacketGenerator(BasePacketGenerator):
     def __init__(self, packet_number, packet_size, source_node_list,
                  target_node_list, time):
         # Call parent class init method
-        super(BatchPacketGenerator, self).__init__()
+        super().__init__()
         self.packet_number = packet_number
         self.packet_size = packet_size
         self.source_node_list = source_node_list

diff --git a/pydtnsim/packet_generators/continuous_packet_generator.py b/pydtnsim/packet_generators/continuous_packet_generator.py
@@ -35,7 +35,7 @@ class ContinuousPacketGenerator(BasePacketGenerator):
     def __init__(self, generation_rate, packet_size, source_node_list,
                  target_node_list, start_time, end_time):
         # Call parent class init method
-        super(ContinuousPacketGenerator, self).__init__()
+        super().__init__()
         self.generation_rate = generation_rate
         self.packet_size = packet_size
         self.source_node_list = source_node_list

diff --git a/pydtnsim/routing/cgr_utils.py b/pydtnsim/routing/cgr_utils.py
@@ -60,8 +60,7 @@ def cgr_neighbor_function(contact_graph, node, destination, current_distance,
                 # Calculate the time (which is either positive or 0, relevant
                 # for artificial terminal nodes)
                 weight = edge.from_time - current_distance
-                if weight < 0:
-                    weight = 0
+                weight = max(weight, 0)
 
                 # Append to neighbor list with weight
                 neighbors.append((edge, weight))