From 456c66763014de233d60e3035bcdd6ae7e162f0f Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sun, 16 Sep 2018 09:40:03 +0200 Subject: [PATCH] remove "from builtins import" Signed-off-by: Heiko Thiery --- pyipmi/__init__.py | 3 --- pyipmi/bmc.py | 3 --- pyipmi/chassis.py | 4 ---- pyipmi/event.py | 2 -- pyipmi/fields.py | 1 - pyipmi/fru.py | 5 ----- pyipmi/hpm.py | 2 -- pyipmi/interfaces/aardvark.py | 2 -- pyipmi/interfaces/ipmb.py | 2 -- pyipmi/interfaces/ipmitool.py | 2 -- pyipmi/interfaces/mock.py | 4 ---- pyipmi/ipmitool.py | 4 ---- pyipmi/lan.py | 2 -- pyipmi/msgs/message.py | 2 -- pyipmi/msgs/picmg.py | 1 - pyipmi/msgs/registry.py | 1 - pyipmi/picmg.py | 3 --- pyipmi/sdr.py | 1 - pyipmi/sel.py | 5 ----- pyipmi/sensor.py | 10 +--------- pyipmi/state.py | 4 ---- pyipmi/utils.py | 2 -- 22 files changed, 1 insertion(+), 64 deletions(-) diff --git a/pyipmi/__init__.py b/pyipmi/__init__.py index 4510ee87..dc7ff4cc 100644 --- a/pyipmi/__init__.py +++ b/pyipmi/__init__.py @@ -15,16 +15,13 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA from __future__ import absolute_import -from builtins import object import time -import sys from . import bmc from . import chassis from . import event from . import fru -#import functools from . import hpm from . import lan from . import picmg diff --git a/pyipmi/bmc.py b/pyipmi/bmc.py index 5c5a3dcf..b5c9d24b 100644 --- a/pyipmi/bmc.py +++ b/pyipmi/bmc.py @@ -14,10 +14,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -from builtins import object - from .msgs import create_request_by_name -#from .errors import DecodingError, CompletionCodeError from .utils import check_completion_code from .state import State from .fields import VersionField diff --git a/pyipmi/chassis.py b/pyipmi/chassis.py index e59d156a..61d1583c 100644 --- a/pyipmi/chassis.py +++ b/pyipmi/chassis.py @@ -15,12 +15,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA from __future__ import absolute_import -from builtins import object - -# from functools import partial from .msgs import create_request_by_name -# from pyipmi.errors import DecodingError, CompletionCodeError from .utils import check_completion_code from .state import State diff --git a/pyipmi/event.py b/pyipmi/event.py index 5df0197b..176bc67e 100644 --- a/pyipmi/event.py +++ b/pyipmi/event.py @@ -14,8 +14,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -from builtins import object - from .utils import check_completion_code from .msgs import create_request_by_name diff --git a/pyipmi/fields.py b/pyipmi/fields.py index 0179bf65..78fe9f2f 100644 --- a/pyipmi/fields.py +++ b/pyipmi/fields.py @@ -1,7 +1,6 @@ #!/usr/bin/env python #-*- coding: utf-8 -*- -#from builtins import object import array diff --git a/pyipmi/fru.py b/pyipmi/fru.py index f1447b9a..459c7dcd 100644 --- a/pyipmi/fru.py +++ b/pyipmi/fru.py @@ -14,11 +14,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -from builtins import chr -from builtins import range -from builtins import object - import array import codecs import datetime diff --git a/pyipmi/hpm.py b/pyipmi/hpm.py index 5bc9c082..27ec7789 100644 --- a/pyipmi/hpm.py +++ b/pyipmi/hpm.py @@ -15,8 +15,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA from __future__ import print_function -from builtins import range -from builtins import object import os import codecs diff --git a/pyipmi/interfaces/aardvark.py b/pyipmi/interfaces/aardvark.py index 17e64865..fda4909c 100644 --- a/pyipmi/interfaces/aardvark.py +++ b/pyipmi/interfaces/aardvark.py @@ -14,8 +14,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -from builtins import object - import time import array diff --git a/pyipmi/interfaces/ipmb.py b/pyipmi/interfaces/ipmb.py index 91da7216..909b3af8 100644 --- a/pyipmi/interfaces/ipmb.py +++ b/pyipmi/interfaces/ipmb.py @@ -14,8 +14,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -from builtins import object - import array diff --git a/pyipmi/interfaces/ipmitool.py b/pyipmi/interfaces/ipmitool.py index ea68202b..249621a6 100644 --- a/pyipmi/interfaces/ipmitool.py +++ b/pyipmi/interfaces/ipmitool.py @@ -14,8 +14,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -from builtins import object - import re from subprocess import Popen, PIPE from array import array diff --git a/pyipmi/interfaces/mock.py b/pyipmi/interfaces/mock.py index 09fe4c65..42047c5f 100644 --- a/pyipmi/interfaces/mock.py +++ b/pyipmi/interfaces/mock.py @@ -1,7 +1,3 @@ - - -from builtins import object - class Mock(object): """This interface uses the ipmitool raw command to "emulate" a RMCP session. diff --git a/pyipmi/ipmitool.py b/pyipmi/ipmitool.py index 75c117f3..9e36d620 100755 --- a/pyipmi/ipmitool.py +++ b/pyipmi/ipmitool.py @@ -19,10 +19,6 @@ from __future__ import print_function from future import standard_library standard_library.install_aliases() -#from builtins import hex -#from builtins import str -#from builtins import map -#from builtins import range from collections import namedtuple import sys diff --git a/pyipmi/lan.py b/pyipmi/lan.py index 87525e1f..c7d9f753 100644 --- a/pyipmi/lan.py +++ b/pyipmi/lan.py @@ -14,8 +14,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# from builtins import object - from .msgs import create_request_by_name from .utils import check_completion_code diff --git a/pyipmi/msgs/message.py b/pyipmi/msgs/message.py index a43ba8d1..7a3e34d6 100644 --- a/pyipmi/msgs/message.py +++ b/pyipmi/msgs/message.py @@ -16,8 +16,6 @@ from __future__ import absolute_import -from builtins import range -from builtins import object from array import array diff --git a/pyipmi/msgs/picmg.py b/pyipmi/msgs/picmg.py index 208d30f8..bc4701ae 100644 --- a/pyipmi/msgs/picmg.py +++ b/pyipmi/msgs/picmg.py @@ -15,7 +15,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA from __future__ import absolute_import -from builtins import range from . import constants from . import register_message_class diff --git a/pyipmi/msgs/registry.py b/pyipmi/msgs/registry.py index cf849ffc..2298b624 100644 --- a/pyipmi/msgs/registry.py +++ b/pyipmi/msgs/registry.py @@ -14,7 +14,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -#from builtins import object from functools import partial from ..errors import DescriptionError diff --git a/pyipmi/picmg.py b/pyipmi/picmg.py index b625b23e..e1ce7222 100644 --- a/pyipmi/picmg.py +++ b/pyipmi/picmg.py @@ -14,9 +14,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# from builtins import object - -import array from .errors import DecodingError, EncodingError, CompletionCodeError from .msgs import create_request_by_name from .msgs import picmg diff --git a/pyipmi/sdr.py b/pyipmi/sdr.py index 90afee2c..065ee184 100644 --- a/pyipmi/sdr.py +++ b/pyipmi/sdr.py @@ -16,7 +16,6 @@ from __future__ import absolute_import from __future__ import division -from builtins import object import math from . import errors diff --git a/pyipmi/sel.py b/pyipmi/sel.py index 3a91875a..4c03f663 100644 --- a/pyipmi/sel.py +++ b/pyipmi/sel.py @@ -15,11 +15,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -#from builtins import range -#from builtins import object - -import time - from .errors import DecodingError, CompletionCodeError, RetryError from .utils import check_completion_code, ByteBuffer from .msgs import create_request_by_name diff --git a/pyipmi/sensor.py b/pyipmi/sensor.py index a0523913..708d043c 100644 --- a/pyipmi/sensor.py +++ b/pyipmi/sensor.py @@ -16,16 +16,8 @@ from __future__ import absolute_import -# from builtins import object - -# import math -# from . import errors -# import array -# import time -# from pyipmi.errors import DecodingError, CompletionCodeError, RetryError -from .utils import check_completion_code # ByteBuffer +from .utils import check_completion_code from .msgs import create_request_by_name -# from .msgs import constants from .helper import get_sdr_data_helper, get_sdr_chunk_helper diff --git a/pyipmi/state.py b/pyipmi/state.py index a229f94a..d14da0a3 100644 --- a/pyipmi/state.py +++ b/pyipmi/state.py @@ -1,7 +1,3 @@ - - -from builtins import object - class DefaultProperties(object): def __init__(self): if hasattr(self, '__properties__'): diff --git a/pyipmi/utils.py b/pyipmi/utils.py index 346ce8ae..de5370c7 100644 --- a/pyipmi/utils.py +++ b/pyipmi/utils.py @@ -14,13 +14,11 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -from builtins import range import sys import codecs from array import array from .msgs import constants from .errors import DecodingError, CompletionCodeError -#from .msgs import create_request_by_name def py3enc_unic_bytes_fix(dat):