diff --git a/BlueSky_pygame.py b/BlueSky_pygame.py index ce9eb8bb6a..c7bb7fb28a 100644 --- a/BlueSky_pygame.py +++ b/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 diff --git a/bluesky/core/trafficarrays.py b/bluesky/core/trafficarrays.py index 2191e374a2..a13eaa1915 100644 --- a/bluesky/core/trafficarrays.py +++ b/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": ""} diff --git a/bluesky/core/varexplorer.py b/bluesky/core/varexplorer.py index 5060cee4a9..4cfb051822 100644 --- a/bluesky/core/varexplorer.py +++ b/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 diff --git a/bluesky/test/__init__.py b/bluesky/test/__init__.py index 1b443f1ec2..e5aeb5a108 100644 --- a/bluesky/test/__init__.py +++ b/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 diff --git a/bluesky/test/tcp/conftest.py b/bluesky/test/tcp/conftest.py index a9261938e4..9ac29bc6db 100644 --- a/bluesky/test/tcp/conftest.py +++ b/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 diff --git a/bluesky/test/traffic/conftest.py b/bluesky/test/traffic/conftest.py index c02b57619b..3c889b00fc 100644 --- a/bluesky/test/traffic/conftest.py +++ b/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 diff --git a/bluesky/traffic/autopilot.py b/bluesky/traffic/autopilot.py index 73bd75ca8f..718972381b 100644 --- a/bluesky/traffic/autopilot.py +++ b/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 diff --git a/bluesky/traffic/traffic.py b/bluesky/traffic/traffic.py index fa41b5e3b9..d61fcfbf68 100644 --- a/bluesky/traffic/traffic.py +++ b/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 diff --git a/bluesky/ui/qtgl/glhelpers.py b/bluesky/ui/qtgl/glhelpers.py index 1ee4e5d32c..28032ce450 100644 --- a/bluesky/ui/qtgl/glhelpers.py +++ b/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 diff --git a/bluesky/ui/qtgl/infowindow.py b/bluesky/ui/qtgl/infowindow.py index 0a635afc79..a32edb3ad8 100644 --- a/bluesky/ui/qtgl/infowindow.py +++ b/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 diff --git a/check.py b/check.py index b1725e42a1..812e4eda48 100644 --- a/check.py +++ b/check.py @@ -1,5 +1,4 @@ #!/usr/bin/python -from __future__ import print_function import traceback import PyQt6