calculate
/
calculate-utils-2.1-server
6
0
Fork 0
Code Issues 3 Pull Requests Releases 1 Wiki Activity

fixed xml in xfce format

Browse Source
py3_forced
Иван Дзюбенко 3 years ago
parent 5ebeb22900
commit c23f429c8a
5 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File

31
pym/cl_base.py
Unescape View File

@ -641,17 +641,17 @@ class DataVars():
pass pass
# добавляем пути к модулям если они не добавлены # добавляем пути к модулям если они не добавлены
if not os.path.abspath(\ if not os.path.abspath(\
'/usr/lib/calculate/calculate-server/pym') in sys.path: '/usr/lib/calculate/calculate-server/pym') in sys.path:
sys.path.insert(0,os.path.abspath(\ sys.path.insert(0,os.path.abspath(\
'/usr/lib/calculate/calculate-server/pym')) '/usr/lib/calculate/calculate-server/pym'))
if not os.path.abspath(\ if not os.path.abspath(\
'/usr/lib/calculate/calculate-lib/pym') in sys.path: '/usr/lib/calculate/calculate-lib/pym') in sys.path:
sys.path.insert(0,os.path.abspath(\ sys.path.insert(0,os.path.abspath(\
'/usr/lib/calculate/calculate-lib/pym')) '/usr/lib/calculate/calculate-lib/pym'))
if not os.path.abspath(\ if not os.path.abspath(\
'/usr/lib/calculate/calculate-builder/pym') in sys.path: '/usr/lib/calculate/calculate-builder/pym') in sys.path:
sys.path.insert(0,os.path.abspath(\ sys.path.insert(0,os.path.abspath(\
'/usr/lib/calculate/calculate-builder/pym')) '/usr/lib/calculate/calculate-builder/pym'))
# Импортируемые модули - (раздел: модуль переменных, модуль заполнения # Импортируемые модули - (раздел: модуль переменных, модуль заполнения
#переменных) #переменных)
__modlist={ __modlist={
@ -699,7 +699,7 @@ class DataVars():
flagFindFillModule = False flagFindFillModule = False
else: else:
err1 = _("Error in import module %s")%modFill err1 = _("Error in import module %s")%modFill
err2 = _("error") + ": " +str(e) err2 = _("error") + ": " + str(e)
raise self.DataVarsError("%s\n%s"%(err1,err2)) raise self.DataVarsError("%s\n%s"%(err1,err2))
if flagFindFillModule: if flagFindFillModule:
# Создаем объект с методами заполнения переменных # Создаем объект с методами заполнения переменных
@ -731,11 +731,11 @@ class DataVars():
if dataVar: if dataVar:
break break
if dataVar == False: if dataVar == False:
err1 = _("Not found variable %s")%nameVar err1 = _("Not found variable %s") % nameVar
err2 = "" err2 = ""
if err: if err:
err2 = _("error") + ": " +str(err) err2 = _("error") + ": " +str(err)
raise self.DataVarsError("%s\n%s"%(err1, err2)) raise self.DataVarsError("%s\n%s" % (err1, err2))
dataVar['service'] = section dataVar['service'] = section
# Ищем метод в объекте методов заполнения # Ищем метод в объекте методов заполнения
nameMethod = "get_" + nameVar nameMethod = "get_" + nameVar
@ -794,13 +794,12 @@ class DataVars():
return ret return ret
def Get(self, nameVar): def Get(self, nameVar):
tmp = self.__Get(nameVar) # tmp = self.__Get(nameVar)
#TODO remove this # isBytes = isinstance(tmp, bytes)
#DEBUG # if isBytes:
isBytes = isinstance(tmp, bytes) # print(f"DEBUG: var {nameVar} returned bytes value: {tmp}")
if isBytes: # return tmp.decode("UTF-8") if isBytes else tmp
print(f"DEBUG: var {nameVar} returned bytes value: {tmp}") return self.__Get(nameVar)
return tmp.decode("UTF-8") if isBytes else tmp
def __Set(self, nameVar, value, force=False): def __Set(self, nameVar, value, force=False):

16
pym/cl_ldap.py
Unescape View File

@ -362,14 +362,14 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon, prnServ):
'Administrators':self.addInfoGroup('Administrators', 'Administrators':self.addInfoGroup('Administrators',
'544', '544',
'Domain Members can fully \ 'Domain Members can fully \
administer the computer/sambaDomainName', administer the computer/sambaDomainName',
'544', '544',
'5', '5',
"S-1-5-32-544"), "S-1-5-32-544"),
'Account Operators':self.addInfoGroup('Account Operators', 'Account Operators':self.addInfoGroup('Account Operators',
'548', '548',
'Domain Users to manipulate \ 'Domain Users to manipulate \
users accounts', users accounts',
'548', '548',
'5', '5',
"S-1-5-32-548"), "S-1-5-32-548"),
@ -388,14 +388,14 @@ users accounts',
'Backup Operators':self.addInfoGroup('Backup Operators', 'Backup Operators':self.addInfoGroup('Backup Operators',
'551', '551',
'Domain Members can bypass \ 'Domain Members can bypass \
file security to back up files', file security to back up files',
'551', '551',
'5', '5',
"S-1-5-32-551"), "S-1-5-32-551"),
'Replicators':self.addInfoGroup('Replicators', 'Replicators':self.addInfoGroup('Replicators',
'552', '552',
'Domain Supports file replication \ 'Domain Supports file replication \
in a sambaDomainName', in a sambaDomainName',
'552', '552',
'5', '5',
"S-1-5-32-552"), "S-1-5-32-552"),
@ -1128,7 +1128,7 @@ in a sambaDomainName',
searchUser = self.searchLdapDN(userName, self.relUsersDN, attr) searchUser = self.searchLdapDN(userName, self.relUsersDN, attr)
if not searchUser: if not searchUser:
self.printERROR(_("User") + " " + str(userName) + " "+\ self.printERROR(_("User") + " " + str(userName) + " "+\
_("not found")) _("not found"))
return False return False
modAttrs = [] modAttrs = []
if not self.dataIsJpeg(photoData): if not self.dataIsJpeg(photoData):
@ -1147,14 +1147,14 @@ in a sambaDomainName',
retcode = pipe.wait() retcode = pipe.wait()
if retcode != 0: if retcode != 0:
self.printERROR(_("Can not convert file '%s' in jpeg format")\ self.printERROR(_("Can not convert file '%s' in jpeg format")\
%photoPath) % photoPath)
flagError = True flagError = True
fErr.close() fErr.close()
if not flagError: if not flagError:
photoData = fOut.read() photoData = fOut.read()
if not self.dataIsJpeg(photoData): if not self.dataIsJpeg(photoData):
self.printERROR(\ self.printERROR(\
_("Can not convert file '%s' in jpeg format") %photoPath) _("Can not convert file '%s' in jpeg format") % photoPath)
flagError = True flagError = True
fOut.close() fOut.close()
if flagError: if flagError:
@ -14953,7 +14953,7 @@ with another option."))
# Изменяем значения аттрибутов для вывода на печать # Изменяем значения аттрибутов для вывода на печать
#modUserAttr already decodes #modUserAttr already decodes
ldapValue[0] = self.modUserAttr(attr, ldapValue[0], ldapValue[0] = self.modUserAttr(attr, ldapValue[0],
service) service)
flagFirst = False flagFirst = False
for value in ldapValue: for value in ldapValue:
if not flagFirst: if not flagFirst:

14
pym/cl_log.py
Unescape View File

@ -33,27 +33,27 @@ class log():
fd = os.open(self.logFile, os.O_CREAT,0o600) fd = os.open(self.logFile, os.O_CREAT,0o600)
os.close(fd) os.close(fd)
except: except:
print("Error creating file %s"%self.logFile) print("Error creating file %s" % self.logFile)
return False return False
textWrite = textLog textWrite = textLog
if not textLog[-1:] == "\n" : if not textLog[-1:] == "\n" :
textWrite = "%s\n"%textLog textWrite = "%s\n" % textLog
if self.addDataTime: if self.addDataTime:
textWrite = "%s %s"%(time.strftime("%d/%m/%Y %H:%M:%S",\ textWrite = "%s %s" % (time.strftime("%d/%m/%Y %H:%M:%S",\
time.localtime()),textWrite) time.localtime()), textWrite)
try: try:
FD = open (self.logFile, "a") FD = open (self.logFile, "a")
FD.write(textWrite) FD.write(textWrite)
FD.close() FD.close()
except: except:
print("Error writing to file %s"%self.logFile) print("Error writing to file %s" % self.logFile)
return False return False
return True return True
def writeError(self, textLog): def writeError(self, textLog):
"""Добавляет сообщение об ошибке в log""" """Добавляет сообщение об ошибке в log"""
return self.addLog("ERROR: %s" %textLog) return self.addLog("ERROR: %s" % textLog)
def writeSuccess(self, textLog): def writeSuccess(self, textLog):
"""Добавляет сообщение об успехе в log""" """Добавляет сообщение об успехе в log"""
return self.addLog("SUCCESS: %s" %textLog) return self.addLog("SUCCESS: %s" % textLog)

4
pym/cl_profile.py
Unescape View File

@ -5670,9 +5670,9 @@ class xml_xfce(_error):
# Объединение нод # Объединение нод
if flagJoin: if flagJoin:
if "value" in nextOldNode.keys(): if "value" in nextOldNode.keys():
oValue = nextOldNode.getAttribute("value") oValue = nextOldNode.get("value")
if nValue != oValue: if nValue != oValue:
nextOldNode.setAttribute("value", nValue) nextOldNode.set("value", nValue)
# Замещение ноды # Замещение ноды
elif flagReplace: elif flagReplace:
replaceXmlNode = deepcopy(xmlNode) replaceXmlNode = deepcopy(xmlNode)

2
pym/cl_utils.py
Unescape View File

@ -606,4 +606,4 @@ def getIpNet(ip,mask=None,cidr=None):
mask = cidrToMask(net) mask = cidrToMask(net)
mask = strIpToIntIp(mask) mask = strIpToIntIp(mask)
return "{ip}/{net}".format(ip=intIpToStrIp(ip&mask), return "{ip}/{net}".format(ip=intIpToStrIp(ip&mask),
net=net) net=net)

Write Preview
Loading…
Cancel
Save