- fixed a syntax error in a call of the log.error()
- trying to solve a 'circular reference' error when saving a project in Arch Linux
This commit is contained in:
22
camlib.py
22
camlib.py
@@ -50,6 +50,14 @@ from appCommon.Common import GracefulException as grace
|
||||
from appParsers.ParseSVG import *
|
||||
from appParsers.ParseDXF import *
|
||||
|
||||
import logging
|
||||
|
||||
import gettext
|
||||
import appTranslation as fcTranslate
|
||||
import builtins
|
||||
|
||||
import copy
|
||||
|
||||
HAS_ORTOOLS = True
|
||||
|
||||
if platform.architecture()[0] == '64bit':
|
||||
@@ -59,12 +67,6 @@ if platform.architecture()[0] == '64bit':
|
||||
except ModuleNotFoundError:
|
||||
HAS_ORTOOLS = False
|
||||
|
||||
import logging
|
||||
|
||||
import gettext
|
||||
import appTranslation as fcTranslate
|
||||
import builtins
|
||||
|
||||
fcTranslate.apply_language('strings')
|
||||
|
||||
log = logging.getLogger('base2')
|
||||
@@ -2271,10 +2273,10 @@ class Geometry(object):
|
||||
:return: A dictionary-encoded copy of the object.
|
||||
:rtype: dict
|
||||
"""
|
||||
d = {}
|
||||
for attr in self.ser_attrs:
|
||||
d[attr] = getattr(self, attr)
|
||||
return d
|
||||
# d = {}
|
||||
# for attr in self.ser_attrs:
|
||||
# d[attr] = getattr(self, attr)
|
||||
return {attr: copy.copy(getattr(self, attr)) for attr in self.ser_attrs}
|
||||
|
||||
def from_dict(self, d):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user