From 15d38d7cc1b76ba276e3a3578b4d72f2f565ab7e Mon Sep 17 00:00:00 2001 From: Alexander Zaft Date: Wed, 4 Oct 2023 13:15:13 +0200 Subject: [PATCH] all: remove coding cookies Change-Id: I53a4d79c3ebc50b8aed43a5ef1fa6538f8059a47 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32251 Tested-by: Jenkins Automated Tests Reviewed-by: Enrico Faulhaber Reviewed-by: Alexander Zaft --- bin/frappy-cfg-editor | 1 - bin/frappy-cli | 1 - bin/frappy-gui | 1 - bin/frappy-play | 1 - bin/make_doc.py | 1 - bin/sim-server | 1 - doc/source/conf.py | 1 - etc/frappy-generator | 1 - frappy/__init__.py | 1 - frappy/client/__init__.py | 1 - frappy/client/interactive.py | 1 - frappy/config.py | 1 - frappy/core.py | 1 - frappy/datatypes.py | 1 - frappy/errors.py | 1 - frappy/features.py | 1 - frappy/gui/cfg_editor/config_file.py | 1 - frappy/gui/cfg_editor/mainwindow.py | 1 - frappy/gui/cfg_editor/node_display.py | 1 - frappy/gui/cfg_editor/tree_widget_item.py | 1 - frappy/gui/cfg_editor/utils.py | 1 - frappy/gui/cfg_editor/widgets.py | 1 - frappy/gui/collapsible.py | 1 - frappy/gui/connection.py | 1 - frappy/gui/console.py | 1 - frappy/gui/logwindow.py | 1 - frappy/gui/mainwindow.py | 1 - frappy/gui/moduleoverview.py | 1 - frappy/gui/modulewidget.py | 1 - frappy/gui/nodewidget.py | 1 - frappy/gui/params/__init__.py | 1 - frappy/gui/paramview.py | 1 - frappy/gui/plotting.py | 1 - frappy/gui/qt.py | 1 - frappy/gui/resources_qt5.py | 1 - frappy/gui/tabwidget.py | 1 - frappy/gui/util.py | 1 - frappy/gui/valuewidgets.py | 1 - frappy/io.py | 1 - frappy/lib/asynconn.py | 1 - frappy/lib/classdoc.py | 1 - frappy/lib/enum.py | 1 - frappy/lib/multievent.py | 1 - frappy/lib/pidfile.py | 1 - frappy/lib/py35compat.py | 3 +-- frappy/lib/sequence.py | 1 - frappy/lib/statemachine.py | 1 - frappy/logging.py | 1 - frappy/mixins.py | 1 - frappy/params.py | 1 - frappy/parse.py | 1 - frappy/persistent.py | 4 +--- frappy/playground.py | 1 - frappy/properties.py | 1 - frappy/protocol/__init__.py | 1 - frappy/protocol/dispatcher.py | 1 - frappy/protocol/interface/__init__.py | 1 - frappy/protocol/interface/zmq.py | 1 - frappy/protocol/messages.py | 1 - frappy/protocol/router.py | 1 - frappy/proxy.py | 1 - frappy/rwhandler.py | 1 - frappy/simulation.py | 1 - frappy/states.py | 1 - frappy_demo/cryo.py | 1 - frappy_demo/lakeshore.py | 1 - frappy_demo/lscsim.py | 1 - frappy_demo/modules.py | 1 - frappy_demo/test.py | 1 - frappy_ess/epics.py | 1 - frappy_mlz/amagnet.py | 1 - frappy_mlz/seop.py | 1 - frappy_mlz/zebra.py | 1 - frappy_psi/ah2700.py | 1 - frappy_psi/ccu4.py | 1 - frappy_psi/channelswitcher.py | 1 - frappy_psi/convergence.py | 1 - frappy_psi/historywriter.py | 1 - frappy_psi/ips_mercury.py | 1 - frappy_psi/k2601b.py | 1 - frappy_psi/ls370res.py | 1 - frappy_psi/magfield.py | 1 - frappy_psi/mercury.py | 1 - frappy_psi/motorvalve.py | 1 - frappy_psi/phytron.py | 1 - frappy_psi/ppms.py | 1 - frappy_psi/ppmssim.py | 1 - frappy_psi/ppmswindows.py | 1 - frappy_psi/softcal.py | 1 - frappy_psi/trinamic.py | 1 - frappy_psi/triton.py | 1 - installer/utils.py | 2 -- setup.py | 1 - test/test_attach.py | 1 - test/test_datatypes.py | 1 - test/test_errors.py | 1 - test/test_handler.py | 1 - test/test_lib.py | 1 - test/test_lib_enum.py | 1 - test/test_logging.py | 1 - test/test_modules.py | 1 - test/test_msg.py | 1 - test/test_multievent.py | 1 - test/test_params.py | 1 - test/test_parse.py | 1 - test/test_persistent.py | 1 - test/test_poller.py | 1 - test/test_properties.py | 1 - test/test_statemachine.py | 1 - test/test_status_members.py | 1 - 110 files changed, 2 insertions(+), 114 deletions(-) diff --git a/bin/frappy-cfg-editor b/bin/frappy-cfg-editor index a2c58fa..4aa0939 100755 --- a/bin/frappy-cfg-editor +++ b/bin/frappy-cfg-editor @@ -1,6 +1,5 @@ #!/usr/bin/env python # pylint: disable=invalid-name -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/bin/frappy-cli b/bin/frappy-cli index c1dc0ea..e6cddd0 100755 --- a/bin/frappy-cli +++ b/bin/frappy-cli @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2016 by the authors, see LICENSE # diff --git a/bin/frappy-gui b/bin/frappy-gui index 02050bf..37416a3 100755 --- a/bin/frappy-gui +++ b/bin/frappy-gui @@ -1,6 +1,5 @@ #!/usr/bin/env python3 # pylint: disable=invalid-name -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2016 by the authors, see LICENSE # diff --git a/bin/frappy-play b/bin/frappy-play index 3c8ca15..ef396bc 100755 --- a/bin/frappy-play +++ b/bin/frappy-play @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2016 by the authors, see LICENSE # diff --git a/bin/make_doc.py b/bin/make_doc.py index a412fb7..d0ed449 100755 --- a/bin/make_doc.py +++ b/bin/make_doc.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/bin/sim-server b/bin/sim-server index 47c54b2..34636c4 100755 --- a/bin/sim-server +++ b/bin/sim-server @@ -1,6 +1,5 @@ #!/usr/bin/env python3 # pylint: disable=invalid-name -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/doc/source/conf.py b/doc/source/conf.py index f76e1d7..974d942 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # # Frappy documentation build configuration file, created by # sphinx-quickstart on Mon Sep 11 10:58:28 2017. diff --git a/etc/frappy-generator b/etc/frappy-generator index d50c226..2c3e30c 100755 --- a/etc/frappy-generator +++ b/etc/frappy-generator @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2019 by the authors, see LICENSE # diff --git a/frappy/__init__.py b/frappy/__init__.py index 89b362c..92cd1c5 100644 --- a/frappy/__init__.py +++ b/frappy/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2016 by the authors, see LICENSE # diff --git a/frappy/client/__init__.py b/frappy/client/__init__.py index 1904798..d12d19e 100644 --- a/frappy/client/__init__.py +++ b/frappy/client/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/client/interactive.py b/frappy/client/interactive.py index 5614f2d..184fa52 100644 --- a/frappy/client/interactive.py +++ b/frappy/client/interactive.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/config.py b/frappy/config.py index 186e57a..fdd875e 100644 --- a/frappy/config.py +++ b/frappy/config.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/core.py b/frappy/core.py index 02948d4..8804859 100644 --- a/frappy/core.py +++ b/frappy/core.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2016 by the authors, see LICENSE # diff --git a/frappy/datatypes.py b/frappy/datatypes.py index 8b36df7..36163bb 100644 --- a/frappy/datatypes.py +++ b/frappy/datatypes.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/errors.py b/frappy/errors.py index 68c9ebd..6ca48bf 100644 --- a/frappy/errors.py +++ b/frappy/errors.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/features.py b/frappy/features.py index 0c7edd2..ee3c27f 100644 --- a/frappy/features.py +++ b/frappy/features.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/gui/cfg_editor/config_file.py b/frappy/gui/cfg_editor/config_file.py index d6a3937..74a9fdc 100644 --- a/frappy/gui/cfg_editor/config_file.py +++ b/frappy/gui/cfg_editor/config_file.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/gui/cfg_editor/mainwindow.py b/frappy/gui/cfg_editor/mainwindow.py index 1bb9f54..cdfd276 100644 --- a/frappy/gui/cfg_editor/mainwindow.py +++ b/frappy/gui/cfg_editor/mainwindow.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/gui/cfg_editor/node_display.py b/frappy/gui/cfg_editor/node_display.py index ecbb0fa..59c2234 100644 --- a/frappy/gui/cfg_editor/node_display.py +++ b/frappy/gui/cfg_editor/node_display.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/gui/cfg_editor/tree_widget_item.py b/frappy/gui/cfg_editor/tree_widget_item.py index b731a15..2b2cead 100644 --- a/frappy/gui/cfg_editor/tree_widget_item.py +++ b/frappy/gui/cfg_editor/tree_widget_item.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/gui/cfg_editor/utils.py b/frappy/gui/cfg_editor/utils.py index 27a8cd3..2e6b03a 100644 --- a/frappy/gui/cfg_editor/utils.py +++ b/frappy/gui/cfg_editor/utils.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/gui/cfg_editor/widgets.py b/frappy/gui/cfg_editor/widgets.py index c1b1297..4777872 100644 --- a/frappy/gui/cfg_editor/widgets.py +++ b/frappy/gui/cfg_editor/widgets.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/gui/collapsible.py b/frappy/gui/collapsible.py index 2718022..8eba605 100644 --- a/frappy/gui/collapsible.py +++ b/frappy/gui/collapsible.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2023 by the authors, see LICENSE # diff --git a/frappy/gui/connection.py b/frappy/gui/connection.py index d6e1740..0b2474d 100644 --- a/frappy/gui/connection.py +++ b/frappy/gui/connection.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2016 by the authors, see LICENSE # diff --git a/frappy/gui/console.py b/frappy/gui/console.py index 74a478b..68fda20 100644 --- a/frappy/gui/console.py +++ b/frappy/gui/console.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2023 by the authors, see LICENSE # diff --git a/frappy/gui/logwindow.py b/frappy/gui/logwindow.py index 11b98fd..70e9e86 100644 --- a/frappy/gui/logwindow.py +++ b/frappy/gui/logwindow.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2023 by the authors, see LICENSE # diff --git a/frappy/gui/mainwindow.py b/frappy/gui/mainwindow.py index 22432de..0db8d8f 100644 --- a/frappy/gui/mainwindow.py +++ b/frappy/gui/mainwindow.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2023 by the authors, see LICENSE # diff --git a/frappy/gui/moduleoverview.py b/frappy/gui/moduleoverview.py index ca1bc9b..ec3c4f5 100644 --- a/frappy/gui/moduleoverview.py +++ b/frappy/gui/moduleoverview.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2023 by the authors, see LICENSE # diff --git a/frappy/gui/modulewidget.py b/frappy/gui/modulewidget.py index 503f971..52f4b91 100644 --- a/frappy/gui/modulewidget.py +++ b/frappy/gui/modulewidget.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2023 by the authors, see LICENSE # diff --git a/frappy/gui/nodewidget.py b/frappy/gui/nodewidget.py index 5cd404c..8ba9e04 100644 --- a/frappy/gui/nodewidget.py +++ b/frappy/gui/nodewidget.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2023 by the authors, see LICENSE # diff --git a/frappy/gui/params/__init__.py b/frappy/gui/params/__init__.py index 2ecdabc..4360e79 100644 --- a/frappy/gui/params/__init__.py +++ b/frappy/gui/params/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2016 by the authors, see LICENSE # diff --git a/frappy/gui/paramview.py b/frappy/gui/paramview.py index 24cc7a4..c9780b2 100644 --- a/frappy/gui/paramview.py +++ b/frappy/gui/paramview.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2017 by the authors, see LICENSE # diff --git a/frappy/gui/plotting.py b/frappy/gui/plotting.py index 9ad6c9b..349f3a8 100644 --- a/frappy/gui/plotting.py +++ b/frappy/gui/plotting.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2023 by the authors, see LICENSE # diff --git a/frappy/gui/qt.py b/frappy/gui/qt.py index 46ba0f3..0fe2ad1 100644 --- a/frappy/gui/qt.py +++ b/frappy/gui/qt.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/gui/resources_qt5.py b/frappy/gui/resources_qt5.py index 357d4c0..183e380 100644 --- a/frappy/gui/resources_qt5.py +++ b/frappy/gui/resources_qt5.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Resource object code # diff --git a/frappy/gui/tabwidget.py b/frappy/gui/tabwidget.py index a270c72..891aca4 100644 --- a/frappy/gui/tabwidget.py +++ b/frappy/gui/tabwidget.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # NICOS, the Networked Instrument Control System of the MLZ # Copyright (c) 2009-2023 by the NICOS contributors (see AUTHORS) diff --git a/frappy/gui/util.py b/frappy/gui/util.py index 51153e9..64b1290 100644 --- a/frappy/gui/util.py +++ b/frappy/gui/util.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2016 by the authors, see LICENSE # diff --git a/frappy/gui/valuewidgets.py b/frappy/gui/valuewidgets.py index 9dd1a35..5fa3a4e 100644 --- a/frappy/gui/valuewidgets.py +++ b/frappy/gui/valuewidgets.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2016 by the authors, see LICENSE # diff --git a/frappy/io.py b/frappy/io.py index 5f2261e..6a57249 100644 --- a/frappy/io.py +++ b/frappy/io.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy/lib/asynconn.py b/frappy/lib/asynconn.py index 7b4b1db..cc448e8 100644 --- a/frappy/lib/asynconn.py +++ b/frappy/lib/asynconn.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/lib/classdoc.py b/frappy/lib/classdoc.py index 4979b39..120aae6 100644 --- a/frappy/lib/classdoc.py +++ b/frappy/lib/classdoc.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/lib/enum.py b/frappy/lib/enum.py index cff1fa0..b63abc5 100644 --- a/frappy/lib/enum.py +++ b/frappy/lib/enum.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # Copyright (c) 2015-2016 by the authors, see LICENSE # diff --git a/frappy/lib/multievent.py b/frappy/lib/multievent.py index a009c4b..d02a278 100644 --- a/frappy/lib/multievent.py +++ b/frappy/lib/multievent.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/lib/pidfile.py b/frappy/lib/pidfile.py index 3a120aa..6f410e7 100644 --- a/frappy/lib/pidfile.py +++ b/frappy/lib/pidfile.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/lib/py35compat.py b/frappy/lib/py35compat.py index fa612ea..e65cdd8 100644 --- a/frappy/lib/py35compat.py +++ b/frappy/lib/py35compat.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under @@ -33,7 +32,7 @@ else: class PEP487Metaclass(type): # support for __set_name__ and __init_subclass__ for older python versions # slightly modified from PEP487 doc - def __new__(cls, *args, **kwargs): + def __new__(cls, *args, **kwargs): # pylint: disable=bad-mcs-classmethod-argument if len(args) != 3: return super().__new__(cls, *args) name, bases, ns = args diff --git a/frappy/lib/sequence.py b/frappy/lib/sequence.py index 60b8771..9674ef1 100644 --- a/frappy/lib/sequence.py +++ b/frappy/lib/sequence.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/lib/statemachine.py b/frappy/lib/statemachine.py index f52ffa6..f2f11d3 100644 --- a/frappy/lib/statemachine.py +++ b/frappy/lib/statemachine.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/logging.py b/frappy/logging.py index be3bcb2..b9c20a4 100644 --- a/frappy/logging.py +++ b/frappy/logging.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/mixins.py b/frappy/mixins.py index c8e56ea..2542196 100644 --- a/frappy/mixins.py +++ b/frappy/mixins.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/params.py b/frappy/params.py index ee24c7a..c2b8f33 100644 --- a/frappy/params.py +++ b/frappy/params.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/parse.py b/frappy/parse.py index 3d10720..58cc69d 100644 --- a/frappy/parse.py +++ b/frappy/parse.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/persistent.py b/frappy/persistent.py index 3477801..e43897c 100644 --- a/frappy/persistent.py +++ b/frappy/persistent.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under @@ -81,8 +80,7 @@ class PersistentMixin(Module): self.persistentFile = os.path.join(persistentdir, f'{self.secNode.equipment_id}.{self.name}.json') self.initData = {} # "factory" settings loaded = self.loadPersistentData() - for pname in self.parameters: - pobj = self.parameters[pname] + for pname, pobj in self.parameters.items(): flag = getattr(pobj, 'persistent', False) if flag: if flag == 'auto': diff --git a/frappy/playground.py b/frappy/playground.py index e6b9fbb..20640c1 100644 --- a/frappy/playground.py +++ b/frappy/playground.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/properties.py b/frappy/properties.py index 47b83a1..a4736e0 100644 --- a/frappy/properties.py +++ b/frappy/properties.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/protocol/__init__.py b/frappy/protocol/__init__.py index 25e867f..168b3f3 100644 --- a/frappy/protocol/__init__.py +++ b/frappy/protocol/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/protocol/dispatcher.py b/frappy/protocol/dispatcher.py index b5b18dc..12aa06c 100644 --- a/frappy/protocol/dispatcher.py +++ b/frappy/protocol/dispatcher.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/protocol/interface/__init__.py b/frappy/protocol/interface/__init__.py index d4662fa..a5e6724 100644 --- a/frappy/protocol/interface/__init__.py +++ b/frappy/protocol/interface/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/protocol/interface/zmq.py b/frappy/protocol/interface/zmq.py index 8bff683..e3e4f79 100644 --- a/frappy/protocol/interface/zmq.py +++ b/frappy/protocol/interface/zmq.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/protocol/messages.py b/frappy/protocol/messages.py index b4b67f5..0fca575 100644 --- a/frappy/protocol/messages.py +++ b/frappy/protocol/messages.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/protocol/router.py b/frappy/protocol/router.py index 795ca65..40f99f3 100644 --- a/frappy/protocol/router.py +++ b/frappy/protocol/router.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/proxy.py b/frappy/proxy.py index 3ea3fe0..c40a01a 100644 --- a/frappy/proxy.py +++ b/frappy/proxy.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/rwhandler.py b/frappy/rwhandler.py index 4a33887..8ee7cda 100644 --- a/frappy/rwhandler.py +++ b/frappy/rwhandler.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy/simulation.py b/frappy/simulation.py index 65a02c3..0b55e82 100644 --- a/frappy/simulation.py +++ b/frappy/simulation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy/states.py b/frappy/states.py index 5eefce9..41a5c0d 100644 --- a/frappy/states.py +++ b/frappy/states.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy_demo/cryo.py b/frappy_demo/cryo.py index b357cc4..98ce5d5 100644 --- a/frappy_demo/cryo.py +++ b/frappy_demo/cryo.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_demo/lakeshore.py b/frappy_demo/lakeshore.py index a363712..9b9fe8e 100644 --- a/frappy_demo/lakeshore.py +++ b/frappy_demo/lakeshore.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_demo/lscsim.py b/frappy_demo/lscsim.py index 7ae25fe..5ea3371 100644 --- a/frappy_demo/lscsim.py +++ b/frappy_demo/lscsim.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_demo/modules.py b/frappy_demo/modules.py index 806e8aa..fd2fec8 100644 --- a/frappy_demo/modules.py +++ b/frappy_demo/modules.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_demo/test.py b/frappy_demo/test.py index 9f494a8..d851dfb 100644 --- a/frappy_demo/test.py +++ b/frappy_demo/test.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_ess/epics.py b/frappy_ess/epics.py index 66724ec..1692279 100644 --- a/frappy_ess/epics.py +++ b/frappy_ess/epics.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_mlz/amagnet.py b/frappy_mlz/amagnet.py index 9056acb..faf5e68 100644 --- a/frappy_mlz/amagnet.py +++ b/frappy_mlz/amagnet.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy_mlz/seop.py b/frappy_mlz/seop.py index c193806..deaf56c 100644 --- a/frappy_mlz/seop.py +++ b/frappy_mlz/seop.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy_mlz/zebra.py b/frappy_mlz/zebra.py index efcca17..a2edb5f 100644 --- a/frappy_mlz/zebra.py +++ b/frappy_mlz/zebra.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # MLZ library of Tango servers # Copyright (c) 2015-2023 by the authors, see LICENSE diff --git a/frappy_psi/ah2700.py b/frappy_psi/ah2700.py index f327bf5..2eb0b42 100644 --- a/frappy_psi/ah2700.py +++ b/frappy_psi/ah2700.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/ccu4.py b/frappy_psi/ccu4.py index 803970f..5774f19 100644 --- a/frappy_psi/ccu4.py +++ b/frappy_psi/ccu4.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy_psi/channelswitcher.py b/frappy_psi/channelswitcher.py index 9e76207..8cd9e8f 100644 --- a/frappy_psi/channelswitcher.py +++ b/frappy_psi/channelswitcher.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/convergence.py b/frappy_psi/convergence.py index bb889b2..9c5d616 100644 --- a/frappy_psi/convergence.py +++ b/frappy_psi/convergence.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy_psi/historywriter.py b/frappy_psi/historywriter.py index 7e39a2e..b18b1df 100644 --- a/frappy_psi/historywriter.py +++ b/frappy_psi/historywriter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/ips_mercury.py b/frappy_psi/ips_mercury.py index 045adfd..e279fa4 100644 --- a/frappy_psi/ips_mercury.py +++ b/frappy_psi/ips_mercury.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/k2601b.py b/frappy_psi/k2601b.py index df92219..9e51ccf 100644 --- a/frappy_psi/k2601b.py +++ b/frappy_psi/k2601b.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/ls370res.py b/frappy_psi/ls370res.py index 86bca8a..32313b5 100644 --- a/frappy_psi/ls370res.py +++ b/frappy_psi/ls370res.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/magfield.py b/frappy_psi/magfield.py index eab0bd1..bb4199b 100644 --- a/frappy_psi/magfield.py +++ b/frappy_psi/magfield.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/mercury.py b/frappy_psi/mercury.py index 6698bd8..596154d 100644 --- a/frappy_psi/mercury.py +++ b/frappy_psi/mercury.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/motorvalve.py b/frappy_psi/motorvalve.py index 06e05b9..0777a2b 100644 --- a/frappy_psi/motorvalve.py +++ b/frappy_psi/motorvalve.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy_psi/phytron.py b/frappy_psi/phytron.py index 5909d05..9f484bf 100644 --- a/frappy_psi/phytron.py +++ b/frappy_psi/phytron.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy_psi/ppms.py b/frappy_psi/ppms.py index abb64b0..2dd4519 100644 --- a/frappy_psi/ppms.py +++ b/frappy_psi/ppms.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/ppmssim.py b/frappy_psi/ppmssim.py index d8d9939..659efe4 100644 --- a/frappy_psi/ppmssim.py +++ b/frappy_psi/ppmssim.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/ppmswindows.py b/frappy_psi/ppmswindows.py index 3110a98..b3298e5 100644 --- a/frappy_psi/ppmswindows.py +++ b/frappy_psi/ppmswindows.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/softcal.py b/frappy_psi/softcal.py index 7f124eb..c60a3dd 100644 --- a/frappy_psi/softcal.py +++ b/frappy_psi/softcal.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/frappy_psi/trinamic.py b/frappy_psi/trinamic.py index c7b50f6..5cb71fa 100644 --- a/frappy_psi/trinamic.py +++ b/frappy_psi/trinamic.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/frappy_psi/triton.py b/frappy_psi/triton.py index df5fdfa..1852d9d 100644 --- a/frappy_psi/triton.py +++ b/frappy_psi/triton.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- # ***************************************************************************** # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software diff --git a/installer/utils.py b/installer/utils.py index de2b80d..2390998 100644 --- a/installer/utils.py +++ b/installer/utils.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - import os import subprocess import sys diff --git a/setup.py b/setup.py index 99d9d93..c4455d3 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # ***************************************************************************** # MLZ Tango client tool # Copyright (c) 2015-2016 by the authors, see LICENSE diff --git a/test/test_attach.py b/test/test_attach.py index ff57f5a..551feda 100644 --- a/test/test_attach.py +++ b/test/test_attach.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_datatypes.py b/test/test_datatypes.py index 8fc5ca1..c7dd5b0 100644 --- a/test/test_datatypes.py +++ b/test/test_datatypes.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_errors.py b/test/test_errors.py index ac4ba43..12ac95f 100644 --- a/test/test_errors.py +++ b/test/test_errors.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_handler.py b/test/test_handler.py index 649422f..0fb5e5e 100644 --- a/test/test_handler.py +++ b/test/test_handler.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_lib.py b/test/test_lib.py index 0fb85e0..d56e175 100644 --- a/test/test_lib.py +++ b/test/test_lib.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_lib_enum.py b/test/test_lib_enum.py index 88864dd..2ae5328 100644 --- a/test/test_lib_enum.py +++ b/test/test_lib_enum.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_logging.py b/test/test_logging.py index d6a9428..1136e80 100644 --- a/test/test_logging.py +++ b/test/test_logging.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_modules.py b/test/test_modules.py index 3301ea4..5a1f498 100644 --- a/test/test_modules.py +++ b/test/test_modules.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_msg.py b/test/test_msg.py index f94ec85..7dd0468 100644 --- a/test/test_msg.py +++ b/test/test_msg.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_multievent.py b/test/test_multievent.py index e124ddc..7eb9bcb 100644 --- a/test/test_multievent.py +++ b/test/test_multievent.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_params.py b/test/test_params.py index a3e3bf9..6b7a364 100644 --- a/test/test_params.py +++ b/test/test_params.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_parse.py b/test/test_parse.py index 6b2975f..3b81edf 100644 --- a/test/test_parse.py +++ b/test/test_parse.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_persistent.py b/test/test_persistent.py index b6935f5..1dd74fc 100644 --- a/test/test_persistent.py +++ b/test/test_persistent.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_poller.py b/test/test_poller.py index da504b2..077c40c 100644 --- a/test/test_poller.py +++ b/test/test_poller.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_properties.py b/test/test_properties.py index 4bac9f7..9bfc44d 100644 --- a/test/test_properties.py +++ b/test/test_properties.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_statemachine.py b/test/test_statemachine.py index 8e12e99..a91371a 100644 --- a/test/test_statemachine.py +++ b/test/test_statemachine.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under diff --git a/test/test_status_members.py b/test/test_status_members.py index 816a2e4..22491c6 100644 --- a/test/test_status_members.py +++ b/test/test_status_members.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ***************************************************************************** # # This program is free software; you can redistribute it and/or modify it under