Remove Python2 checks

Remove Python2 code snippets

Author: fbeitler

doc/api/doxygen/build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 '''
 Doxygen API Builder
 ---------------------
@@ -29,8 +29,8 @@ def which(program):
     return None
 
 if which('doxygen') is not None:
-    print "Building Doxygen API Documentation"
+    print("Building Doxygen API Documentation")
     os.system("doxygen .doxygen")
     if os.path.exists('../../../build'):
         shutil.move("html", "../../../build/doxygen")
-else: print "Doxygen not available...not building"
+else: print("Doxygen not available...not building")

doc/api/epydoc/build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 '''
 Epydoc API Runner
 ------------------
@@ -27,12 +27,12 @@
     if not os.path.exists("./html"):
         os.mkdir("./html")
 
-    print "Building Epydoc API Documentation"
+    print( "Building Epydoc API Documentation")
     cli()
 
     if os.path.exists('../../../build'):
         shutil.move("html", "../../../build/epydoc")
-except Exception, ex:
+except Exception as ex:
     import traceback,sys
     traceback.print_exc(file=sys.stdout)
-    print "Epydoc not avaliable...not building"
+    print( "Epydoc not avaliable...not building")

doc/api/pydoc/build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Pydoc sub-class for generating documentation for entire packages.
 
@@ -447,7 +447,7 @@ def recurseScan(self, objectList):
     if not os.path.exists("./html"):
         os.mkdir("./html")
 
-    print "Building Pydoc API Documentation"
+    print( "Building Pydoc API Documentation")
     PackageDocumentationGenerator(
         baseModules = ['pymodbus', '__builtin__'],
         destinationDirectory = "./html/",

doc/api/pydoctor/build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 '''
 Pydoctor API Runner
 ---------------------
@@ -19,9 +19,10 @@
         --html-output=html
         --html-write-function-pages --make-html'''.split()
 
-    print "Building Pydoctor API Documentation"
+    print( "Building Pydoctor API Documentation")
     main(sys.argv[1:])
 
     if os.path.exists('../../../build'):
         shutil.move("html", "../../../build/pydoctor")
-except: print "Pydoctor unavailable...not building"
+except:
+    print( "Pydoctor unavailable...not building")

examples/common/async_asyncio_client.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Pymodbus Asynchronous Client Examples
 --------------------------------------------------------------------------
@@ -8,22 +8,16 @@
 
 The example is only valid on Python3.4 and above
 """
-from pymodbus.compat import IS_PYTHON3, PYTHON_VERSION
-if IS_PYTHON3 and PYTHON_VERSION >= (3, 4):
-    import asyncio
-    import logging
-    # ----------------------------------------------------------------------- #
-    # Import the required asynchronous client
-    # ----------------------------------------------------------------------- #
-    from pymodbus.client.asynchronous.tcp import AsyncModbusTCPClient as ModbusClient
-    # from pymodbus.client.asynchronous.udp import (
-    #     AsyncModbusUDPClient as ModbusClient)
-    from pymodbus.client.asynchronous import schedulers
-
-else:
-    import sys
-    sys.stderr("This example needs to be run only on python 3.4 and above")
-    sys.exit(1)
+import asyncio
+import logging
+# ----------------------------------------------------------------------- #
+# Import the required asynchronous client
+# ----------------------------------------------------------------------- #
+from pymodbus.client.asynchronous.tcp import AsyncModbusTCPClient as ModbusClient
+# from pymodbus.client.asynchronous.udp import (
+#     AsyncModbusUDPClient as ModbusClient)
+from pymodbus.client.asynchronous import schedulers
+
 
 from threading import Thread
 import time

examples/common/async_asyncio_serial_client.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Pymodbus Asynchronous Client Examples
 --------------------------------------------------------------------------
@@ -8,17 +8,12 @@
 
 The example is only valid on Python3.4 and above
 """
-from pymodbus.compat import IS_PYTHON3, PYTHON_VERSION
-if IS_PYTHON3 and PYTHON_VERSION >= (3, 4):
-    import logging
-    import asyncio
-    from pymodbus.client.asynchronous.serial import (
-        AsyncModbusSerialClient as ModbusClient)
-    from pymodbus.client.asynchronous import schedulers
-else:
-    import sys
-    sys.stderr("This example needs to be run only on python 3.4 and above")
-    sys.exit(1)
+import logging
+import asyncio
+from pymodbus.client.asynchronous.serial import (
+    AsyncModbusSerialClient as ModbusClient)
+from pymodbus.client.asynchronous import schedulers
+
 
 # --------------------------------------------------------------------------- #
 # configure the client logging

examples/common/async_tornado_client.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Pymodbus Asynchronous Client Examples
 --------------------------------------------------------------------------

examples/common/async_tornado_client_serial.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Pymodbus Asynchronous Client Examples
 --------------------------------------------------------------------------

examples/common/async_twisted_client.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Pymodbus Asynchronous Client Examples
 --------------------------------------------------------------------------

examples/common/async_twisted_client_serial.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Pymodbus Asynchronous Client Examples
 --------------------------------------------------------------------------