diff --git a/DDCore/python/dd4hep.py b/DDCore/python/dd4hep.py index 7528f711459fbc2f0c9644baa59cd80fe00acdaa..f476450d18e81b69ddcf149b79dc814c6769b92e 100644 --- a/DDCore/python/dd4hep.py +++ b/DDCore/python/dd4hep.py @@ -8,6 +8,6 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from dd4hep_base import * import_units(__import__(__name__)) diff --git a/DDCore/python/dd4hepFactories.py b/DDCore/python/dd4hepFactories.py index c999a6102432fb2f630ea874b9206d155f5650f6..59182e1e4c19c37b52026880ea83ddde7674954c 100755 --- a/DDCore/python/dd4hepFactories.py +++ b/DDCore/python/dd4hepFactories.py @@ -10,7 +10,7 @@ # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, optparse, logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/DDCore/python/dd4hep_base.py b/DDCore/python/dd4hep_base.py index 20c8ee077d97ff5167cf010f24744ef4d9c87ee7..36f81375dee0f9d6cdb30a462d08e2e9fd707a63 100644 --- a/DDCore/python/dd4hep_base.py +++ b/DDCore/python/dd4hep_base.py @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import imp, logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/DDCore/python/lcdd.py b/DDCore/python/lcdd.py index 8a834d18907e8a9dfae02d155982c4d45ef2bc5c..0f62786d2d058a4cd21d3ce2b15c394ab2a47152 100644 --- a/DDCore/python/lcdd.py +++ b/DDCore/python/lcdd.py @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from math import cos, sin, pi, tan from os import path, listdir diff --git a/DDDigi/python/DDDigi.py b/DDDigi/python/DDDigi.py index 31950d8fd09e3655a1bc3f0c13426eca4d633cf5..e7da48f84913af38e18248cb5bd5824e9865867d 100644 --- a/DDDigi/python/DDDigi.py +++ b/DDDigi/python/DDDigi.py @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging from dd4hep_base import * diff --git a/DDG4/examples/CLICSidSimuLCIO.py b/DDG4/examples/CLICSidSimuLCIO.py index 637598ef374ae4a7ee6527d4f81420108a9ccb57..ad86e1e46f1558f978cd267b1b66b73b7cf8dad4 100644 --- a/DDG4/examples/CLICSidSimuLCIO.py +++ b/DDG4/examples/CLICSidSimuLCIO.py @@ -6,7 +6,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/DDG4/examples/CLICSidSimuMarkus.py b/DDG4/examples/CLICSidSimuMarkus.py index 9d4f0bffba98050eecac7ba37cffac4791d5f11b..7a30d0799b5c0d5c8638d6e300814773b5da5e28 100644 --- a/DDG4/examples/CLICSidSimuMarkus.py +++ b/DDG4/examples/CLICSidSimuMarkus.py @@ -1,6 +1,6 @@ # # -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, time, logging, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/DDG4/examples/SiDSim.py b/DDG4/examples/SiDSim.py index fe8aa5edcb481be016f10999c6b6e4d570576ab2..8d68f8a9c86fc81c0da4de849dd5d8e7e6fe6623 100644 --- a/DDG4/examples/SiDSim.py +++ b/DDG4/examples/SiDSim.py @@ -1,6 +1,6 @@ # # -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, time, logging, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/DDG4/examples/SiDSim_MT.py b/DDG4/examples/SiDSim_MT.py index a6899136f31b39fea86e4f9799cb662804cec54a..82d0222a761e1c1f67b12b44544d78b4952f7deb 100644 --- a/DDG4/examples/SiDSim_MT.py +++ b/DDG4/examples/SiDSim_MT.py @@ -1,6 +1,6 @@ # # -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, time, logging, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/DDG4/examples/SiD_Markus.py b/DDG4/examples/SiD_Markus.py index a85ab58d81bac4368fcef450ee7b2a5e8f6c1789..ae4c61acdc43f5230b69fb2c03a3b72ea92b1dda 100644 --- a/DDG4/examples/SiD_Markus.py +++ b/DDG4/examples/SiD_Markus.py @@ -1,6 +1,6 @@ # # -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, time, logging, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/DDG4/examples/readHEPMC.py b/DDG4/examples/readHEPMC.py index d563fb4b72c63942eb9c0a24797fabdc58f0cd61..3edf9f5ff468f74224c821e43628a80c7ff961b7 100644 --- a/DDG4/examples/readHEPMC.py +++ b/DDG4/examples/readHEPMC.py @@ -6,7 +6,7 @@ dd4hep simulation example setup using the python configuration @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py index 10216e3c4ad988d991beccc2ad99c3ac1d5dd010..4f1289325de344ed5369e77db32d744270e82758 100644 --- a/DDG4/python/DDG4.py +++ b/DDG4/python/DDG4.py @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging from dd4hep_base import * diff --git a/DDG4/python/DDSim/DD4hepSimulation.py b/DDG4/python/DDSim/DD4hepSimulation.py index 5c86e9234895be64f2eda1ede23ad9367e05275d..a937b3a7762976ee5ffc75dfeb4405d05122064b 100644 --- a/DDG4/python/DDSim/DD4hepSimulation.py +++ b/DDG4/python/DDSim/DD4hepSimulation.py @@ -6,7 +6,7 @@ Based on M. Frank and F. Gaede runSim.py @version 0.1 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals __RCSID__ = "$Id$" from g4units import * import logging diff --git a/DDG4/python/DDSim/Helper/Action.py b/DDG4/python/DDSim/Helper/Action.py index e8b471e8f3f74adb95656b2eb6961a365f9e998f..c4348f099a95e01c3a5bd58b64f9d5b58a16c913 100644 --- a/DDG4/python/DDSim/Helper/Action.py +++ b/DDG4/python/DDSim/Helper/Action.py @@ -1,7 +1,7 @@ """Helper object for SD Actions """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from DDSim.Helper.ConfigHelper import ConfigHelper class Action( ConfigHelper ): diff --git a/DDG4/python/DDSim/Helper/ConfigHelper.py b/DDG4/python/DDSim/Helper/ConfigHelper.py index 172ec52d5ac48bdc72529133212eb51bd59f4d4a..d3bf50bdcbe65b035272334a690361ea2f9247d4 100644 --- a/DDG4/python/DDSim/Helper/ConfigHelper.py +++ b/DDG4/python/DDSim/Helper/ConfigHelper.py @@ -12,7 +12,7 @@ call for the parser object create an additional member:: """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from pprint import pprint class ConfigHelper( object ): diff --git a/DDG4/python/DDSim/Helper/Filter.py b/DDG4/python/DDSim/Helper/Filter.py index e3c94b2ed1b04644c16d9a5c8593ee1883494699..51de3c1ecb25d0e71d8decc5321385f5f01d96c9 100644 --- a/DDG4/python/DDSim/Helper/Filter.py +++ b/DDG4/python/DDSim/Helper/Filter.py @@ -5,7 +5,7 @@ The default filters are a GeantinoRejector and a 1keV minimum energy cut """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from DDSim.Helper.ConfigHelper import ConfigHelper from g4units import keV import logging diff --git a/DDG4/python/DDSim/Helper/GuineaPig.py b/DDG4/python/DDSim/Helper/GuineaPig.py index 146ebec21dc5e34e2db679cc61f7f560618930d3..e4d2ded06661d59bf4acb897cd2456ff26a6d0cd 100644 --- a/DDG4/python/DDSim/Helper/GuineaPig.py +++ b/DDG4/python/DDSim/Helper/GuineaPig.py @@ -1,6 +1,6 @@ """Helper object for GuineaPig InputFile Parameters""" -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from DDSim.Helper.Input import Input class GuineaPig( Input ): diff --git a/DDG4/python/DDSim/Helper/Gun.py b/DDG4/python/DDSim/Helper/Gun.py index 755c3228a43e214beadf013a2e3a3e41ff09618a..05616c7a39e4370c1da46b3323a431d6fac0e327 100644 --- a/DDG4/python/DDSim/Helper/Gun.py +++ b/DDG4/python/DDSim/Helper/Gun.py @@ -1,6 +1,6 @@ """Helper object for particle gun properties""" -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from DDSim.Helper.ConfigHelper import ConfigHelper from g4units import GeV import logging diff --git a/DDG4/python/DDSim/Helper/Input.py b/DDG4/python/DDSim/Helper/Input.py index 68f8351a5cda154e693f6db2dd87957a0bb3d1ad..372d2788efbda12eae0445829d4767265c5aed44 100644 --- a/DDG4/python/DDSim/Helper/Input.py +++ b/DDG4/python/DDSim/Helper/Input.py @@ -1,6 +1,6 @@ """Base class for inputfile parameters""" -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from DDSim.Helper.ConfigHelper import ConfigHelper class Input( ConfigHelper ): diff --git a/DDG4/python/DDSim/Helper/LCIO.py b/DDG4/python/DDSim/Helper/LCIO.py index 3cfc4b2f8adfa110e7b68e8d6cf21d4a9d95a057..2f793eae73182ebdf135a082c6ef378726dbdbcd 100644 --- a/DDG4/python/DDSim/Helper/LCIO.py +++ b/DDG4/python/DDSim/Helper/LCIO.py @@ -1,6 +1,6 @@ """Helper object for files containing one or more MCParticle collections""" -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from DDSim.Helper.Input import Input class LCIO( Input ): diff --git a/DDG4/python/DDSim/Helper/MagneticField.py b/DDG4/python/DDSim/Helper/MagneticField.py index 9c6f13a78ed582724853b070e2a3a68490a51ef0..36263d2581f7223bd4b031352aa45ff344b52969 100644 --- a/DDG4/python/DDSim/Helper/MagneticField.py +++ b/DDG4/python/DDSim/Helper/MagneticField.py @@ -1,5 +1,5 @@ """Helper object for Magnetic Field properties""" -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from g4units import mm, m from DDSim.Helper.ConfigHelper import ConfigHelper diff --git a/DDG4/python/DDSim/Helper/Meta.py b/DDG4/python/DDSim/Helper/Meta.py index 5a8254cbad90e18174ac6dfd0df0c2286df391b5..b8b9d96f26e76e08ffddc1095d1e3a89eb1813ab 100644 --- a/DDG4/python/DDSim/Helper/Meta.py +++ b/DDG4/python/DDSim/Helper/Meta.py @@ -1,6 +1,6 @@ """Helper object for configuring the LCIO output file (meta)""" -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import datetime import os import logging diff --git a/DDG4/python/DDSim/Helper/Output.py b/DDG4/python/DDSim/Helper/Output.py index 58b4222213db134b4a6d937dbc2e1ae2b488cf9d..09e4c6afd3e130ae06136657282663c080b76dfb 100644 --- a/DDG4/python/DDSim/Helper/Output.py +++ b/DDG4/python/DDSim/Helper/Output.py @@ -1,6 +1,6 @@ """Dummy helper object for particle gun properties""" -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from DDSim.Helper.ConfigHelper import ConfigHelper from DDSim.DD4hepSimulation import outputLevel diff --git a/DDG4/python/DDSim/Helper/ParticleHandler.py b/DDG4/python/DDSim/Helper/ParticleHandler.py index 46f201e5759939ea0b1f1998d5c99e9d8802b191..80bb7926c23a781aed08d643410eb5407a4346e9 100644 --- a/DDG4/python/DDSim/Helper/ParticleHandler.py +++ b/DDG4/python/DDSim/Helper/ParticleHandler.py @@ -1,5 +1,5 @@ """Configuration Helper for ParticleHandler""" -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from g4units import MeV, mm import logging diff --git a/DDG4/python/DDSim/Helper/Physics.py b/DDG4/python/DDSim/Helper/Physics.py index 11cd2e84499b12cb066fcabe0c618fb986bf4117..897c9e38261ac76a417bce23db30e59badcf158e 100644 --- a/DDG4/python/DDSim/Helper/Physics.py +++ b/DDG4/python/DDSim/Helper/Physics.py @@ -1,6 +1,6 @@ """Helper object for physicslist properties""" -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os from DDSim.Helper.ConfigHelper import ConfigHelper diff --git a/DDG4/python/DDSim/Helper/Random.py b/DDG4/python/DDSim/Helper/Random.py index 625b87a00e453cd234b955bf773a90d3291408b7..af69edf8ae6fc5345c935c8db3d7dd31c9d9f4c8 100644 --- a/DDG4/python/DDSim/Helper/Random.py +++ b/DDG4/python/DDSim/Helper/Random.py @@ -1,6 +1,6 @@ """Helper object for random number generator objects""" -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import random import logging diff --git a/DDG4/python/SystemOfUnits.py b/DDG4/python/SystemOfUnits.py index 513e3f05ba58d4d29d688055c483c37e16b1c22f..d7a049a71eceecd96a1626e901bf19d195543693 100644 --- a/DDG4/python/SystemOfUnits.py +++ b/DDG4/python/SystemOfUnits.py @@ -13,6 +13,6 @@ # The namespace "DD4hep" is deprecated. Please use "dd4hep" instead. # #========================================================================== -from __future__ import absolute_import, print_function +from __future__ import absolute_import, unicode_literals, print_function from g4units import * print('DEPRECATION WARNING The namespace "SystemOfUnits" is deprecated. Please use "g4units" instead.') diff --git a/DDG4/python/checkGeometry.py b/DDG4/python/checkGeometry.py index 83f4f031d66fb950bcf35e432624633e1e13507b..813ce657aadc1908901c0d7ad47d67d3db84b1a9 100755 --- a/DDG4/python/checkGeometry.py +++ b/DDG4/python/checkGeometry.py @@ -10,7 +10,7 @@ # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import sys, errno, optparse, logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/DDG4/python/checkOverlaps.py b/DDG4/python/checkOverlaps.py index a648951534361b57802a288c91e3968447b99297..2ea26a344c0fa3d2c4174bc1ed27b08334f3031c 100755 --- a/DDG4/python/checkOverlaps.py +++ b/DDG4/python/checkOverlaps.py @@ -10,7 +10,7 @@ # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import sys, errno, optparse, logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/DDG4/python/g4MaterialScan.py b/DDG4/python/g4MaterialScan.py index acf8742bf877d2859f875b5e677b5aa181a3c458..988e3b65fbddad626ceb0f48a2857e60a415477e 100644 --- a/DDG4/python/g4MaterialScan.py +++ b/DDG4/python/g4MaterialScan.py @@ -10,7 +10,7 @@ # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, errno, optparse, logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/DDRec/python/DDRec.py b/DDRec/python/DDRec.py index 71ff5d1237ccbb3a19eeb8d010ef89695437eb4c..b6521971e339aec5eb3cf36d5449c15fae16c33d 100644 --- a/DDRec/python/DDRec.py +++ b/DDRec/python/DDRec.py @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/DDRec/python/dumpDetectorData.py b/DDRec/python/dumpDetectorData.py index af01788c663b89858b95325293d7089a50072132..f317a4f742007f2a097887d5e635953ecc7a6c74 100644 --- a/DDRec/python/dumpDetectorData.py +++ b/DDRec/python/dumpDetectorData.py @@ -10,7 +10,7 @@ # #========================================================================== -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import sys, errno, optparse, logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py b/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py index bd15fae5bc53cf087069f2e5f5cfc77999b37ba0..9728147bf6a11417073e64c40e4fcbbc5bccac08 100644 --- a/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py +++ b/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py @@ -1,5 +1,5 @@ # cpluginsvc is a ctypes-based wrapper for the C-exposed API of GaudiPluginService -from __future__ import absolute_import, print_function +from __future__ import absolute_import, unicode_literals, print_function __doc__ = ''' cpluginsvc is a ctypes-based wrapper for the C-API of the GaudiPluginService. diff --git a/etc/CreateParsers.py b/etc/CreateParsers.py index 52ce9656157ff226f378ba5ee1d9d0b2d58110bc..62af7aa3c4f9b06b36e270a6f5abad363661223b 100644 --- a/etc/CreateParsers.py +++ b/etc/CreateParsers.py @@ -10,7 +10,7 @@ python CreateParsers.py """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os LICENSE ="""// $Id$ diff --git a/examples/AlignDet/drivers/BoxSegment.py b/examples/AlignDet/drivers/BoxSegment.py index dd50804ceba6eb54986b72083e579ece6129ce33..eb8f016cca64c5872f66829f3d7ea16f57c18d8e 100644 --- a/examples/AlignDet/drivers/BoxSegment.py +++ b/examples/AlignDet/drivers/BoxSegment.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, unicode_literals + def detector_BoxSegment(description, det): box = det.find('box') mat = det.find('material') diff --git a/examples/AlignDet/drivers/Shelf.py b/examples/AlignDet/drivers/Shelf.py index 9b00fbe1d4b3ee8b7f5c0e4c60a0ae88ae98154a..1a28f53a90ca0ce62c045af12fa4895c8f996832 100644 --- a/examples/AlignDet/drivers/Shelf.py +++ b/examples/AlignDet/drivers/Shelf.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, unicode_literals + def detector_Shelf(description, det): plane = det.find('planes') diff --git a/examples/CLICSiD/scripts/CLICMagField.py b/examples/CLICSiD/scripts/CLICMagField.py index 3d1f221e576e75ea80b1a860ef4bb31b38853383..9ecbb664fc28a51c9e5398772d5b6b70967dc13d 100644 --- a/examples/CLICSiD/scripts/CLICMagField.py +++ b/examples/CLICSiD/scripts/CLICMagField.py @@ -5,7 +5,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals if __name__ == "__main__": import CLICSid sid = CLICSid.CLICSid().loadGeometry() diff --git a/examples/CLICSiD/scripts/CLICPhysics.py b/examples/CLICSiD/scripts/CLICPhysics.py index 87d4d891074d6454db63a1a21e550733dcfe2091..19bc03b35d8347370e57880476c76e097caf03cb 100644 --- a/examples/CLICSiD/scripts/CLICPhysics.py +++ b/examples/CLICSiD/scripts/CLICPhysics.py @@ -5,7 +5,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals if __name__ == "__main__": import CLICSid sid = CLICSid.CLICSid().loadGeometry() diff --git a/examples/CLICSiD/scripts/CLICRandom.py b/examples/CLICSiD/scripts/CLICRandom.py index c10af43f47a0f058aa6da75a62ceb8f8548fb171..9676ddef82d733c8c7259cf7dd4ac6b93bce8296 100644 --- a/examples/CLICSiD/scripts/CLICRandom.py +++ b/examples/CLICSiD/scripts/CLICRandom.py @@ -5,7 +5,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from ROOT import TRandom from ROOT import gRandom diff --git a/examples/CLICSiD/scripts/CLICSiDScan.py b/examples/CLICSiD/scripts/CLICSiDScan.py index e3f487d947ed18a7afa9a0b82f529394f25fb7e9..811d146cae6d3bed456825b0d8216630417b5fa9 100644 --- a/examples/CLICSiD/scripts/CLICSiDScan.py +++ b/examples/CLICSiD/scripts/CLICSiDScan.py @@ -6,7 +6,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/examples/CLICSiD/scripts/CLICSiD_LoadROOTGeo.py b/examples/CLICSiD/scripts/CLICSiD_LoadROOTGeo.py index e66a16711b31bdd7aded7975572fd43a688a48d4..1a91628272632f1bf6cae96d11d512592ac56819 100644 --- a/examples/CLICSiD/scripts/CLICSiD_LoadROOTGeo.py +++ b/examples/CLICSiD/scripts/CLICSiD_LoadROOTGeo.py @@ -7,7 +7,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/examples/CLICSiD/scripts/CLICSid.py b/examples/CLICSiD/scripts/CLICSid.py index 67686730ae3542db7dc2b6e4022bf1d909ab75b4..79ab3ca01c7a7aed80c9e22a1d60cb52ed49e2d3 100644 --- a/examples/CLICSiD/scripts/CLICSid.py +++ b/examples/CLICSiD/scripts/CLICSid.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import sys, logging, DDG4 from g4units import * diff --git a/examples/CLICSiD/scripts/CLIC_G4Gun.py b/examples/CLICSiD/scripts/CLIC_G4Gun.py index 31bc191be0b8c017a1f009dcb5c7a2673db6c70c..9c2fe24de72e3f04c2b747a67963f1e911f9188d 100644 --- a/examples/CLICSiD/scripts/CLIC_G4Gun.py +++ b/examples/CLICSiD/scripts/CLIC_G4Gun.py @@ -7,7 +7,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging diff --git a/examples/CLICSiD/scripts/CLIC_GDML.py b/examples/CLICSiD/scripts/CLIC_GDML.py index 81327ae91cc8c9e097c8a3044cf5eb4a3a11f0a4..ceefc6546eec72daad6a4fa0422493e5272c0034 100644 --- a/examples/CLICSiD/scripts/CLIC_GDML.py +++ b/examples/CLICSiD/scripts/CLIC_GDML.py @@ -6,7 +6,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from g4units import * def run(): diff --git a/examples/CLICSiD/scripts/testDDPython.py b/examples/CLICSiD/scripts/testDDPython.py index b4ed56600488be6289af3e9d4d8708d37f8932b8..5a3e86c097616d0bccfa72bd48de67ff0f9cc575 100644 --- a/examples/CLICSiD/scripts/testDDPython.py +++ b/examples/CLICSiD/scripts/testDDPython.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from ROOT import gSystem import os, logging, platform diff --git a/examples/ClientTests/scripts/Assemblies.py b/examples/ClientTests/scripts/Assemblies.py index a916590d7ccb5e9abbfd5d51b0acd36419d7bcf3..76ce5c3679c738692d2ab5118f7fd45823499b26 100644 --- a/examples/ClientTests/scripts/Assemblies.py +++ b/examples/ClientTests/scripts/Assemblies.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from SystemOfUnits import * # diff --git a/examples/ClientTests/scripts/DDG4TestSetup.py b/examples/ClientTests/scripts/DDG4TestSetup.py index 4243bc5d60cfb878d7c76ec6b0fbdc5b133b4fd6..b21db2b5b4ba39b49ac6f7e4f8d24ca34235d01e 100644 --- a/examples/ClientTests/scripts/DDG4TestSetup.py +++ b/examples/ClientTests/scripts/DDG4TestSetup.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, logging, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/examples/ClientTests/scripts/FCC_Hcal.py b/examples/ClientTests/scripts/FCC_Hcal.py index 886467bb75a1de06c5fd028a92452d13ad53bd40..9ef697adafdfea8e6e1e3c6a88c6d85c1dece522 100644 --- a/examples/ClientTests/scripts/FCC_Hcal.py +++ b/examples/ClientTests/scripts/FCC_Hcal.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/examples/ClientTests/scripts/LheD_tracker.py b/examples/ClientTests/scripts/LheD_tracker.py index ece390b56ed696991d705a48ecb0b613dc057474..2e8f561dc61ad7cfc1b4ac17a9262b2a79e99f17 100644 --- a/examples/ClientTests/scripts/LheD_tracker.py +++ b/examples/ClientTests/scripts/LheD_tracker.py @@ -1,6 +1,6 @@ # # -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/examples/ClientTests/scripts/MiniTel.py b/examples/ClientTests/scripts/MiniTel.py index 48b45399d5a2dac7ba9aa458d40318a4e257fb01..6137ac1fdfb9b050f3d18c68c1005a6151d67305 100644 --- a/examples/ClientTests/scripts/MiniTel.py +++ b/examples/ClientTests/scripts/MiniTel.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, DDG4 # """ diff --git a/examples/ClientTests/scripts/MiniTelEnergyDeposits.py b/examples/ClientTests/scripts/MiniTelEnergyDeposits.py index cbe975d2e5958c6e33e9b5f84a7943aa9fcd36f4..00025d0ecb71f44e6570447c7306b54802da4911 100644 --- a/examples/ClientTests/scripts/MiniTelEnergyDeposits.py +++ b/examples/ClientTests/scripts/MiniTelEnergyDeposits.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import sys, time, DDG4, MiniTelSetup from DDG4 import OutputLevel as Output # diff --git a/examples/ClientTests/scripts/MiniTelRegions.py b/examples/ClientTests/scripts/MiniTelRegions.py index f6d05bdd0fc7f8cb7c0173149f1eec58743e426a..c66fd28c0611f5c01beb8b275ea72f07952571fc 100644 --- a/examples/ClientTests/scripts/MiniTelRegions.py +++ b/examples/ClientTests/scripts/MiniTelRegions.py @@ -5,7 +5,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/examples/ClientTests/scripts/MiniTelSetup.py b/examples/ClientTests/scripts/MiniTelSetup.py index b986563de6f512d315adfb129027b48e9d4f5068..066f0f975a0445fa365fdf4a2ace16ae992bb93f 100644 --- a/examples/ClientTests/scripts/MiniTelSetup.py +++ b/examples/ClientTests/scripts/MiniTelSetup.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, time, DDG4TestSetup """ diff --git a/examples/ClientTests/scripts/MultiCollections.py b/examples/ClientTests/scripts/MultiCollections.py index 732317e25ee8a93c9ae7696483f37a5e3f7b81eb..20ef1d7f42a4c3538d95bcaf3e2237e52427680e 100644 --- a/examples/ClientTests/scripts/MultiCollections.py +++ b/examples/ClientTests/scripts/MultiCollections.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/examples/ClientTests/scripts/MultiSegmentCollections.py b/examples/ClientTests/scripts/MultiSegmentCollections.py index 3b5c1a79885b7c888b8ca933557690738027fb65..167c44cc4db0bcc2906dc0b4b8a5befad8371799 100644 --- a/examples/ClientTests/scripts/MultiSegmentCollections.py +++ b/examples/ClientTests/scripts/MultiSegmentCollections.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/examples/ClientTests/scripts/NestedDetectors.py b/examples/ClientTests/scripts/NestedDetectors.py index 234a4dd7d5c987891eb11c4f3a082d376f0761ee..dc5627cf19f157aa3c94cd78338158ab04202da0 100644 --- a/examples/ClientTests/scripts/NestedDetectors.py +++ b/examples/ClientTests/scripts/NestedDetectors.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/examples/ClientTests/scripts/SiliconBlock.py b/examples/ClientTests/scripts/SiliconBlock.py index 96269fdd4be795281d78b62c8a713967ad335025..358d9928d14491fb3dde440062cc4d6efeba876a 100644 --- a/examples/ClientTests/scripts/SiliconBlock.py +++ b/examples/ClientTests/scripts/SiliconBlock.py @@ -1,6 +1,6 @@ # # -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/examples/ClientTests/scripts/TrackingRegion.py b/examples/ClientTests/scripts/TrackingRegion.py index 8b4c808e5cab8df7ad45162dac362dbe85c8305a..f1954a7f5d56c27aa3fe91480f5ba59a699a3375 100644 --- a/examples/ClientTests/scripts/TrackingRegion.py +++ b/examples/ClientTests/scripts/TrackingRegion.py @@ -1,6 +1,6 @@ # # -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 # """ diff --git a/examples/DDCMS/scripts/CMSTrackerSim.py b/examples/DDCMS/scripts/CMSTrackerSim.py index cdd17addb603515db5e0b1edc41f46b3374f727c..40d6be5635dba5e376bd8b9092b25a7b19305a6c 100644 --- a/examples/DDCMS/scripts/CMSTrackerSim.py +++ b/examples/DDCMS/scripts/CMSTrackerSim.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/examples/DDCodex/python/CODEX-b-alone.py b/examples/DDCodex/python/CODEX-b-alone.py index 7c8b824a1b7ead61b33e778d55b2700a9068660c..e6941fc5723ebf9872cf7dbdc72e36146a979f99 100755 --- a/examples/DDCodex/python/CODEX-b-alone.py +++ b/examples/DDCodex/python/CODEX-b-alone.py @@ -1,6 +1,6 @@ # # -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/examples/DDCodex/python/GeoExtract.py b/examples/DDCodex/python/GeoExtract.py index 675cdf5a142855eb6213690fa71b65cc01d4d600..d4885d9865461750aa6532ea473dccbeca50f119 100755 --- a/examples/DDCodex/python/GeoExtract.py +++ b/examples/DDCodex/python/GeoExtract.py @@ -4,7 +4,7 @@ # Syntax is: # gaudirun.py Brunel-Default.py <someDataFiles>.py ############################################################################### -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from Gaudi.Configuration import * from Configurables import LHCbConfigurableUser, LHCbApp, CondDB, ToolSvc, EventSelector from Configurables import LoadDD4hepDet, LbDD4hepExample diff --git a/examples/DDDigi/scripts/TestFramework.py b/examples/DDDigi/scripts/TestFramework.py index 411a590d003f8d88b0038c78003ecf583eec4574..f0a0c61dffb15070c726763bcdbc80a1d23eb4e0 100644 --- a/examples/DDDigi/scripts/TestFramework.py +++ b/examples/DDDigi/scripts/TestFramework.py @@ -1,6 +1,6 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, DDDigi DDDigi.setPrintFormat('%-32s %5s %s') diff --git a/examples/DDG4_MySensDet/scripts/MyTrackerSD_sim.py b/examples/DDG4_MySensDet/scripts/MyTrackerSD_sim.py index c83f35691a7bf0b7e0718a1ca0c18348ba7e331b..d09278108f93fd2ea68ea655ca87cb6b7c9a8aa2 100644 --- a/examples/DDG4_MySensDet/scripts/MyTrackerSD_sim.py +++ b/examples/DDG4_MySensDet/scripts/MyTrackerSD_sim.py @@ -1,6 +1,6 @@ # # -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4, dd4hep from DDG4 import OutputLevel as Output from SystemOfUnits import * diff --git a/examples/LHeD/scripts/LHeD.py b/examples/LHeD/scripts/LHeD.py index 69774a7a1d4b6d8331c08268afb93b02eab8e820..eac078b9cd29c824302cc014212c8862c5c6f5c7 100644 --- a/examples/LHeD/scripts/LHeD.py +++ b/examples/LHeD/scripts/LHeD.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import sys, logging, DDG4 from SystemOfUnits import * diff --git a/examples/LHeD/scripts/LHeDMagField.py b/examples/LHeD/scripts/LHeDMagField.py index e8aec740571308abc6b74f3f769a485e63fdf979..83c048b2bf6743a4bce019361ad7d722810f6242 100644 --- a/examples/LHeD/scripts/LHeDMagField.py +++ b/examples/LHeD/scripts/LHeDMagField.py @@ -5,7 +5,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals if __name__ == "__main__": import LHeD lhed = LHeD.LHeD().loadGeometry() diff --git a/examples/LHeD/scripts/LHeDPhysics.py b/examples/LHeD/scripts/LHeDPhysics.py index d568ef0ca93c7a33ac3df720167297d0b6b55edc..97e9e644b3541f69d93df3aa1e75adb7c6dd4948 100644 --- a/examples/LHeD/scripts/LHeDPhysics.py +++ b/examples/LHeD/scripts/LHeDPhysics.py @@ -5,7 +5,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals if __name__ == "__main__": import LHeD lhed = LHeD.LHeD().loadGeometry() diff --git a/examples/LHeD/scripts/LHeDRandom.py b/examples/LHeD/scripts/LHeDRandom.py index 3def4ca8039d65d3aa01337e4d6a7ba2e25278ef..d0f28248771609a2f792b4241ae2c66a90bdf320 100644 --- a/examples/LHeD/scripts/LHeDRandom.py +++ b/examples/LHeD/scripts/LHeDRandom.py @@ -5,7 +5,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals from ROOT import TRandom from ROOT import gRandom import logging diff --git a/examples/LHeD/scripts/LHeDScan.py b/examples/LHeD/scripts/LHeDScan.py index c5f5d8dba8e1dcab599b49879bf1f8e3d2f9236f..6f824c639038c5624d40572fbdb73cb2d820460b 100644 --- a/examples/LHeD/scripts/LHeDScan.py +++ b/examples/LHeD/scripts/LHeDScan.py @@ -6,7 +6,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/examples/LHeD/scripts/LHeD_G4Gun.py b/examples/LHeD/scripts/LHeD_G4Gun.py index 4c704d9872182d27f8e65951f7a4de75d8cbfc38..8b769d2b88ff5212e42cebbaf14886ca396a57ba 100644 --- a/examples/LHeD/scripts/LHeD_G4Gun.py +++ b/examples/LHeD/scripts/LHeD_G4Gun.py @@ -7,7 +7,7 @@ @version 1.0 """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/examples/LHeD/scripts/LheSimu.py b/examples/LHeD/scripts/LheSimu.py index 5838f0baec4e484caf88993694511dd39e1e54e4..6238f3b25b1d3422feaccf88001117fb98d72cd4 100644 --- a/examples/LHeD/scripts/LheSimu.py +++ b/examples/LHeD/scripts/LheSimu.py @@ -7,7 +7,7 @@ modified for LHeC """ -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import logging logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/examples/OpticalSurfaces/scripts/OpNovice.py b/examples/OpticalSurfaces/scripts/OpNovice.py index 0928f2d1e9e9fedc6eee12623f068ef275b00c1c..5b8eafd0a1aacc9031f3e506260b24b1fa2fdb72 100644 --- a/examples/OpticalSurfaces/scripts/OpNovice.py +++ b/examples/OpticalSurfaces/scripts/OpNovice.py @@ -1,6 +1,6 @@ # # -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import *