Removed obsolete compatibility statements

BlueSky_pygame.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 """ Pygame BlueSky start script """
-from __future__ import print_function
 import pygame as pg
 import bluesky as bs
 from bluesky.ui.pygame import splash

bluesky/core/trafficarrays.py

@@ -1,11 +1,7 @@
 """ Classes that derive from TrafficArrays (like Traffic) get automated create,
     delete, and reset functionality for all registered child arrays."""
 # -*- coding: utf-8 -*-
-try:
-    from collections.abc import Collection
-except ImportError:
-    # In python <3.3 collections.abc doesn't exist
-    from collections import Collection
+from collections.abc import Collection
 import numpy as np
 
 defaults = {"float": 0.0, "int": 0, "uint":0, "bool": False, "S": "", "str": ""}

bluesky/core/varexplorer.py

@@ -4,11 +4,7 @@
 '''
 from numbers import Number
 from collections import OrderedDict
-try:
-    from collections.abc import Collection
-except ImportError:
-    # In python <3.3 collections.abc doesn't exist
-    from collections import Collection
+from collections.abc import Collection
 import re
 import numpy as np
 import bluesky as bs

bluesky/test/__init__.py

@@ -10,7 +10,6 @@
 NOTE - The test suite is written in Python3 only.
 It tests BlueSky running in either Python2 or 3.
 """
-from __future__ import print_function
 import inspect
 import time
 from bluesky.tools.network import as_bytes

bluesky/test/tcp/conftest.py

@@ -10,7 +10,6 @@
 NOTE - The test suite is written in Python3 only.
 It tests BlueSky running in either Python2 or 3.
 """
-from __future__ import print_function
 import socket
 import os
 import subprocess

bluesky/test/traffic/conftest.py

@@ -9,7 +9,6 @@
 
 NOTE - The test suite is written in Python3 only.
 """
-from __future__ import print_function
 import pytest
 import bluesky
 

bluesky/traffic/autopilot.py

@@ -1,11 +1,7 @@
 """ Autopilot Implementation."""
 from math import sqrt, atan
 import numpy as np
-try:
-    from collections.abc import Collection
-except ImportError:
-    # In python <3.3 collections.abc doesn't exist
-    from collections import Collection
+from collections.abc import Collection
 import bluesky as bs
 from bluesky import stack
 from bluesky.tools import geo

bluesky/traffic/traffic.py

@@ -1,10 +1,5 @@
 """ BlueSky traffic implementation."""
-from __future__ import print_function
-try:
-    from collections.abc import Collection
-except ImportError:
-    # In python <3.3 collections.abc doesn't exist
-    from collections import Collection
+from collections.abc import Collection
 from math import *
 from random import randint
 import numpy as np

bluesky/ui/qtgl/glhelpers.py

@@ -26,11 +26,7 @@
     opengl_versions = ((4, 1), (2, 1), (2, 0))
 
 
-try:
-    from collections.abc import Collection, MutableMapping
-except ImportError:
-    # In python <3.3 collections.abc doesn't exist
-    from collections import Collection, MutableMapping
+from collections.abc import Collection, MutableMapping
 import ctypes
 import numpy as np
 

bluesky/ui/qtgl/infowindow.py

@@ -1,8 +1,4 @@
-try:
-    from collections.abc import Collection
-except ImportError:
-    # In python <3.3 collections.abc doesn't exist
-    from collections import Collection
+from collections.abc import Collection
 import numpy as np
 import matplotlib
 matplotlib.rcParams['font.size'] = 5

check.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python
-from __future__ import print_function
 import traceback
 
 import PyQt6