From d76dabb513f5a2f40b132c8aaceb022e6d852270 Mon Sep 17 00:00:00 2001 From: Marko Petric <marko.petric@cern.ch> Date: Wed, 24 Jul 2019 13:22:29 +0200 Subject: [PATCH] import unicode_literals in all py files --- DDCore/python/dd4hep.py | 2 +- DDCore/python/dd4hepFactories.py | 2 +- DDCore/python/dd4hep_base.py | 2 +- DDCore/python/lcdd.py | 2 +- DDDigi/python/DDDigi.py | 2 +- DDG4/examples/CLICSidSimuLCIO.py | 2 +- DDG4/examples/CLICSidSimuMarkus.py | 2 +- DDG4/examples/SiDSim.py | 2 +- DDG4/examples/SiDSim_MT.py | 2 +- DDG4/examples/SiD_Markus.py | 2 +- DDG4/examples/readHEPMC.py | 2 +- DDG4/python/DDG4.py | 2 +- DDG4/python/DDSim/DD4hepSimulation.py | 2 +- DDG4/python/DDSim/Helper/Action.py | 2 +- DDG4/python/DDSim/Helper/ConfigHelper.py | 2 +- DDG4/python/DDSim/Helper/Filter.py | 2 +- DDG4/python/DDSim/Helper/GuineaPig.py | 2 +- DDG4/python/DDSim/Helper/Gun.py | 2 +- DDG4/python/DDSim/Helper/Input.py | 2 +- DDG4/python/DDSim/Helper/LCIO.py | 2 +- DDG4/python/DDSim/Helper/MagneticField.py | 2 +- DDG4/python/DDSim/Helper/Meta.py | 2 +- DDG4/python/DDSim/Helper/Output.py | 2 +- DDG4/python/DDSim/Helper/ParticleHandler.py | 2 +- DDG4/python/DDSim/Helper/Physics.py | 2 +- DDG4/python/DDSim/Helper/Random.py | 2 +- DDG4/python/SystemOfUnits.py | 2 +- DDG4/python/checkGeometry.py | 2 +- DDG4/python/checkOverlaps.py | 2 +- DDG4/python/g4MaterialScan.py | 2 +- DDRec/python/DDRec.py | 2 +- DDRec/python/dumpDetectorData.py | 2 +- GaudiPluginService/python/GaudiPluginService/cpluginsvc.py | 2 +- etc/CreateParsers.py | 2 +- examples/AlignDet/drivers/BoxSegment.py | 2 ++ examples/AlignDet/drivers/Shelf.py | 2 ++ examples/CLICSiD/scripts/CLICMagField.py | 2 +- examples/CLICSiD/scripts/CLICPhysics.py | 2 +- examples/CLICSiD/scripts/CLICRandom.py | 2 +- examples/CLICSiD/scripts/CLICSiDScan.py | 2 +- examples/CLICSiD/scripts/CLICSiD_LoadROOTGeo.py | 2 +- examples/CLICSiD/scripts/CLICSid.py | 2 +- examples/CLICSiD/scripts/CLIC_G4Gun.py | 2 +- examples/CLICSiD/scripts/CLIC_GDML.py | 2 +- examples/CLICSiD/scripts/testDDPython.py | 2 +- examples/ClientTests/scripts/Assemblies.py | 2 +- examples/ClientTests/scripts/DDG4TestSetup.py | 2 +- examples/ClientTests/scripts/FCC_Hcal.py | 2 +- examples/ClientTests/scripts/LheD_tracker.py | 2 +- examples/ClientTests/scripts/MiniTel.py | 2 +- examples/ClientTests/scripts/MiniTelEnergyDeposits.py | 2 +- examples/ClientTests/scripts/MiniTelRegions.py | 2 +- examples/ClientTests/scripts/MiniTelSetup.py | 2 +- examples/ClientTests/scripts/MultiCollections.py | 2 +- examples/ClientTests/scripts/MultiSegmentCollections.py | 2 +- examples/ClientTests/scripts/NestedDetectors.py | 2 +- examples/ClientTests/scripts/SiliconBlock.py | 2 +- examples/ClientTests/scripts/TrackingRegion.py | 2 +- examples/DDCMS/scripts/CMSTrackerSim.py | 2 +- examples/DDCodex/python/CODEX-b-alone.py | 2 +- examples/DDCodex/python/GeoExtract.py | 2 +- examples/DDDigi/scripts/TestFramework.py | 2 +- examples/DDG4_MySensDet/scripts/MyTrackerSD_sim.py | 2 +- examples/LHeD/scripts/LHeD.py | 2 +- examples/LHeD/scripts/LHeDMagField.py | 2 +- examples/LHeD/scripts/LHeDPhysics.py | 2 +- examples/LHeD/scripts/LHeDRandom.py | 2 +- examples/LHeD/scripts/LHeDScan.py | 2 +- examples/LHeD/scripts/LHeD_G4Gun.py | 2 +- examples/LHeD/scripts/LheSimu.py | 2 +- examples/OpticalSurfaces/scripts/OpNovice.py | 2 +- 71 files changed, 73 insertions(+), 69 deletions(-) diff --git a/DDCore/python/dd4hep.py b/DDCore/python/dd4hep.py index 7528f7114..f476450d1 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 c999a6102..59182e1e4 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 20c8ee077..36f81375d 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 8a834d189..0f62786d2 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 31950d8fd..e7da48f84 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 637598ef3..ad86e1e46 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 9d4f0bffb..7a30d0799 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 fe8aa5edc..8d68f8a9c 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 a6899136f..82d0222a7 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 a85ab58d8..ae4c61acd 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 d563fb4b7..3edf9f5ff 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 10216e3c4..4f1289325 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 5c86e9234..a937b3a77 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 e8b471e8f..c4348f099 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 172ec52d5..d3bf50bdc 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 e3c94b2ed..51de3c1ec 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 146ebec21..e4d2ded06 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 755c3228a..05616c7a3 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 68f8351a5..372d2788e 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 3cfc4b2f8..2f793eae7 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 9c6f13a78..36263d258 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 5a8254cba..b8b9d96f2 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 58b422221..09e4c6afd 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 46f201e57..80bb7926c 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 11cd2e844..897c9e382 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 625b87a00..af69edf8a 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 513e3f05b..d7a049a71 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 83f4f031d..813ce657a 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 a64895153..2ea26a344 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 acf8742bf..988e3b65f 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 71ff5d123..b6521971e 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 af01788c6..f317a4f74 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 bd15fae5b..9728147bf 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 52ce96561..62af7aa3c 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 dd50804ce..eb8f016cc 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 9b00fbe1d..1a28f53a9 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 3d1f221e5..9ecbb664f 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 87d4d8910..19bc03b35 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 c10af43f4..9676ddef8 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 e3f487d94..811d146ca 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 e66a16711..1a9162827 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 67686730a..79ab3ca01 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 31bc191be..9c2fe24de 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 81327ae91..ceefc6546 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 b4ed56600..5a3e86c09 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 a916590d7..76ce5c367 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 4243bc5d6..b21db2b5b 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 886467bb7..9ef697ada 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 ece390b56..2e8f561dc 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 48b45399d..6137ac1fd 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 cbe975d2e..00025d0ec 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 f6d05bdd0..c66fd28c0 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 b986563de..066f0f975 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 732317e25..20ef1d7f4 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 3b5c1a798..167c44cc4 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 234a4dd7d..dc5627cf1 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 96269fdd4..358d9928d 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 8b4c808e5..f1954a7f5 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 cdd17addb..40d6be563 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 7c8b824a1..e6941fc57 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 675cdf5a1..d4885d986 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 411a590d0..f0a0c61df 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 c83f35691..d09278108 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 69774a7a1..eac078b9c 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 e8aec7405..83c048b2b 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 d568ef0ca..97e9e644b 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 3def4ca80..d0f282487 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 c5f5d8dba..6f824c639 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 4c704d987..8b769d2b8 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 5838f0bae..6238f3b25 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 0928f2d1e..5b8eafd0a 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 * -- GitLab