linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove py2 support

Browse Source 
Change-Id: Ieeaeb3b8efcae004e94aea6c1d2703c9782a8650
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21320
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber
2019-09-25 17:45:26 +02:00
parent 04032079d7
commit 70a9c42a7a
59 changed files with 458 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
secop/modules.py
View File

@ -21,7 +21,6 @@
# *****************************************************************************
"""Define Baseclasses for real Modules implemented in the server"""
from __future__ import division, print_function
import sys
import time
@ -33,7 +32,6 @@ from secop.errors import ConfigError, ProgrammingError
from secop.lib import formatException, \
formatExtendedStack, mkthread, unset_value
from secop.lib.enum import Enum
from secop.lib.metaclass import add_metaclass
from secop.metaclass import ModuleMeta
from secop.params import PREDEFINED_ACCESSIBLES, Command, Override, Parameter, Parameters, Commands
from secop.properties import HasProperties, Property
@ -45,8 +43,7 @@ from secop.properties import HasProperties, Property
# from these base classes (how to do this?)
@add_metaclass(ModuleMeta)
class Module(HasProperties):
class Module(HasProperties, metaclass=ModuleMeta):
"""Basic Module
ALL secop Modules derive from this
@ -205,7 +202,7 @@ class Module(HasProperties):
# (self.name, k, e))
# note: this will call write_* methods which will
# write to the hardware, if possible!
if k != u'value':
if k != 'value':
setattr(self, k, v)
cfgdict.pop(k)