Merge 456c667 into 7fdf81b

kontron · Sep 16, 2018 · 216bd85 · 216bd85
2 parents 7fdf81b + 456c667
commit 216bd85
Show file tree

Hide file tree

Showing 22 changed files with 1 addition and 64 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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):