cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

work in progress: Python3 fixes

Browse source
This commit is contained in:
Helmut Merz 2024-09-24 19:23:54 +02:00
parent 42d24a5c3f
commit 53be77b5b9
10 changed files with 74 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
loops/README.txt
View file

@ -444,13 +444,13 @@ Node Views
>>> page = view.page >>> page = view.page
>>> items = page.textItems >>> items = page.textItems
>>> for item in items: >>> for item in items:
... print item.url, item.editable ... print(item.url, item.editable)
http://127.0.0.1/loops/views/m1/m11/m112 False http://127.0.0.1/loops/views/m1/m11/m112 False
>>> menu = view.menu >>> menu = view.menu
>>> items = menu.menuItems >>> items = menu.menuItems
>>> for item in items: >>> for item in items:
... print item.url, view.selected(item) ... print(item.url, view.selected(item))
http://127.0.0.1/loops/views/m1/m11 True http://127.0.0.1/loops/views/m1/m11 True
A NodeView provides an itemNum attribute that may be used to count elements A NodeView provides an itemNum attribute that may be used to count elements
@ -796,7 +796,7 @@ that in turns calls formlibs ``setUpWidgets()``.
The new technique uses the ``fields`` and ``data`` attributes... The new technique uses the ``fields`` and ``data`` attributes...
>>> for f in view.fields: >>> for f in view.fields:
... print f.name, f.fieldType, f.required, f.vocabulary ... print(f.name, f.fieldType, f.required, f.vocabulary)
title textline True None title textline True None
data textarea False None data textarea False None
contentType dropdown True <...SimpleVocabulary object...> contentType dropdown True <...SimpleVocabulary object...>
@ -804,8 +804,8 @@ The new technique uses the ``fields`` and ``data`` attributes...
linkText textline False None linkText textline False None
>>> view.data >>> view.data
{'linkUrl': 'http://', 'contentType': 'text/restructured', 'data': '', {'title': 'Test Note', 'data': '', 'contentType': 'text/restructured',
'linkText': '', 'title': 'Test Note'} 'linkUrl': 'http://', 'linkText': ''}
The object is changed via a FormController adapter created for The object is changed via a FormController adapter created for
a NodeView. a NodeView.
@ -883,13 +883,13 @@ informations about all parents of an object.
>>> parents = m113.getAllParents() >>> parents = m113.getAllParents()
>>> for p in parents: >>> for p in parents:
... print p.object.title ... print(p.object.title)
Zope Zope
Menu Menu
>>> parents = resources['test_note'].getAllParents() >>> parents = resources['test_note'].getAllParents()
>>> for p in parents: >>> for p in parents:
... print p.object.title, len(p.relations) ... print(p.object.title, len(p.relations))
Note 1 Note 1
Type 2 Type 2
@ -916,10 +916,10 @@ relates ISO country codes with the full name of the country.
[('at', ['Austria']), ('de', ['Germany'])] [('at', ['Austria']), ('de', ['Germany'])]
>>> countries.dataAsRecords() >>> countries.dataAsRecords()
[{'value': 'Austria', 'key': 'at'}, {'value': 'Germany', 'key': 'de'}] [{'key': 'at', 'value': 'Austria'}, {'key': 'de', 'value': 'Germany'}]
>>> countries.getRowsByValue('value', 'Germany') >>> countries.getRowsByValue('value', 'Germany')
[{'value': 'Germany', 'key': 'de'}] [{'key': 'de', 'value': 'Germany'}]
The ``recordstable`` type is a variation of this datable type that contains The ``recordstable`` type is a variation of this datable type that contains
a simple list of records - without a key column. A record in this type is a a simple list of records - without a key column. A record in this type is a
@ -939,7 +939,7 @@ We just reuse the existing ``countries`` table and convert it to a records table
>>> countries = adapted(concepts['countries']) >>> countries = adapted(concepts['countries'])
>>> countries.data >>> countries.data
[{'value': 'Austria', 'key': 'at'}, {'value': 'Germany', 'key': 'de'}] [{'key': 'at', 'value': 'Austria'}, {'key': 'de', 'value': 'Germany'}]
Caching Caching

31
loops/browser/form.py
View file

@ -1,35 +1,18 @@
# # loops.browser.form
# Copyright (c) 2017 Helmut Merz helmutm@cy55.de
#
# 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 Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
""" """ Classes for form presentation and processing.
Classes for form presentation and processing.
""" """
from urllib import urlencode, unquote_plus from urllib.parse import urlencode, unquote_plus
from zope.app.container.contained import ObjectRemovedEvent
from zope import component, interface, schema from zope import component, interface, schema
from zope.component import adapts from zope.component import adapts
from zope.container.contained import ObjectRemovedEvent
from zope.event import notify from zope.event import notify
from zope.interface import Interface from zope.interface import Interface
from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
from zope.app.container.interfaces import INameChooser from zope.container.interfaces import INameChooser
from zope.app.container.contained import ObjectAddedEvent from zope.lifecycleevent import ObjectAddedEvent
from zope.app.pagetemplate import ViewPageTemplateFile from zope.browserpage import ViewPageTemplateFile
from zope.cachedescriptors.property import Lazy from zope.cachedescriptors.property import Lazy
from zope.contenttype import guess_content_type from zope.contenttype import guess_content_type
from zope.publisher.browser import FileUpload from zope.publisher.browser import FileUpload

36
loops/browser/resource.py
View file

@ -1,36 +1,18 @@
# # loops.browser.resource
# Copyright (c) 2015 Helmut Merz helmutm@cy55.de
#
# 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 Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
""" """ View class for resource objects.
View class for resource objects.
""" """
import os.path import os.path
import urllib from zope.authentication.interfaces import IUnauthenticatedPrincipal
from zope.browserpagge import ViewPageTemplateFile
from zope.cachedescriptors.property import Lazy from zope.cachedescriptors.property import Lazy
from zope import component from zope import component
from zope.app.catalog.interfaces import ICatalog from zope.catalog.interfaces import ICatalog
from zope.app.container.interfaces import INameChooser from zope.container.interfaces import INameChooser
from zope.app.form.browser.textwidgets import FileWidget
from zope.app.pagetemplate import ViewPageTemplateFile
from zope.app.security.interfaces import IUnauthenticatedPrincipal
from zope.formlib.form import FormFields from zope.formlib.form import FormFields
from zope.formlib.interfaces import DISPLAY_UNWRITEABLE from zope.formlib.interfaces import DISPLAY_UNWRITEABLE
from zope.formlib.textwidgets import FileWidget
from zope.proxy import removeAllProxies from zope.proxy import removeAllProxies
from zope.schema.interfaces import IBytes from zope.schema.interfaces import IBytes
from zope.security import canAccess, canWrite from zope.security import canAccess, canWrite
@ -272,7 +254,7 @@ class ResourceView(BaseView):
#wp = wiki.createPage(getName(self.context)) #wp = wiki.createPage(getName(self.context))
wp = wiki.addPage(LoopsWikiPage(self.context)) wp = wiki.addPage(LoopsWikiPage(self.context))
wp.text = text wp.text = text
#print wp.wiki.getManager() #print(wp.wiki.getManager())
#return util.toUnicode(wp.render(self.request)) #return util.toUnicode(wp.render(self.request))
return super(ResourceView, self).renderText(text, contentType) return super(ResourceView, self).renderText(text, contentType)
@ -467,7 +449,7 @@ class ExternalEditorView(ExternalEditorView, BaseView):
r.append('meta_type:' + '.'.join((context.__module__, context.__class__.__name__))) r.append('meta_type:' + '.'.join((context.__module__, context.__class__.__name__)))
auth = self.request.get('_auth') auth = self.request.get('_auth')
if auth: if auth:
print 'ExternalEditorView: auth = ', auth print('ExternalEditorView: auth = ', auth)
if auth.endswith('\n'): if auth.endswith('\n'):
auth = auth[:-1] auth = auth[:-1]
r.append('auth:' + auth) r.append('auth:' + auth)

16
loops/common.py
View file

@ -233,12 +233,12 @@ def generateNameFromTitle(title):
def normalizeName(baseName): def normalizeName(baseName):
specialCharacters = { specialCharacters = {
'\xc4': 'Ae', '\xe4': 'ae', '\xd6': 'Oe', '\xf6': 'oe', b'\xc4': 'Ae', b'\xe4': 'ae', b'\xd6': 'Oe', b'\xf6': 'oe',
'\xdc': 'Ue', '\xfc': 'ue', '\xdf': 'ss'} b'\xdc': 'Ue', b'\xfc': 'ue', b'\xdf': 'ss'}
result = [] result = []
for c in baseName: for c in baseName:
try: try:
c = c.encode('ISO8859-15') x = c.encode('ISO8859-15')
except UnicodeEncodeError: except UnicodeEncodeError:
# replace all characters not representable in ISO encoding # replace all characters not representable in ISO encoding
result.append('_') result.append('_')
@ -250,13 +250,13 @@ def normalizeName(baseName):
# separator and special characters to keep # separator and special characters to keep
result.append(c) result.append(c)
continue continue
if c in specialCharacters: if x in specialCharacters:
# transform umlauts and other special characters # transform umlauts and other special characters
result.append(specialCharacters[c].lower()) result.append(specialCharacters[x].lower())
continue continue
if ord(c) > 127: if ord(x) > 127:
# map to ASCII characters # map to ASCII characters
c = chr(ord(c) & 127) c = chr(ord(x) & 127).decode('ISO8859-15')
if c in ':,/\\ ': if c in ':,/\\ ':
# replace separator characters with _ # replace separator characters with _
result.append('_') result.append('_')
@ -265,7 +265,7 @@ def normalizeName(baseName):
continue continue
else: else:
result.append(c.lower()) result.append(c.lower())
name = unicode(''.join(result)) name = ''.join(result)
return name return name

32
loops/psu.py
View file

@ -13,17 +13,17 @@
import os import os
from transaction import commit, abort from transaction import commit, abort
from zope.app.authentication.principalfolder import Principal
from zope.app.component.hooks import setSite
from zope.app.container.contained import ObjectAddedEvent, ObjectRemovedEvent
from zope.cachedescriptors.property import Lazy from zope.cachedescriptors.property import Lazy
from zope.catalog.interfaces import ICatalog from zope.catalog.interfaces import ICatalog
from zope.copypastemove.interfaces import IContainerItemRenamer
from zope import component from zope import component
from zope.component.hooks import setSite
from zope.container.contained import ObjectAddedEvent, ObjectRemovedEvent
from zope.copypastemove.interfaces import IContainerItemRenamer
from zope.event import notify from zope.event import notify
from zope.exceptions.interfaces import DuplicationError from zope.exceptions.interfaces import DuplicationError
from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
from zope.publisher.browser import TestRequest as BaseTestRequest from zope.publisher.browser import TestRequest as BaseTestRequest
from zope.pluggableauth.factories import Principal
from zope.security.management import getInteraction, newInteraction, endInteraction from zope.security.management import getInteraction, newInteraction, endInteraction
from zope.interface import Interface from zope.interface import Interface
@ -83,7 +83,7 @@ def notifyRemoved(obj):
def delete(container, name, docommit=True): def delete(container, name, docommit=True):
obj = container.get(name) obj = container.get(name)
if obj is None: if obj is None:
print '*** Object', name, 'not found!' print('*** Object', name, 'not found!')
return return
notifyRemoved(obj) notifyRemoved(obj)
del container[name] del container[name]
@ -93,14 +93,14 @@ def delete(container, name, docommit=True):
def rename(container, old, new, docommit=True): def rename(container, old, new, docommit=True):
obj = container.get(old) obj = container.get(old)
if obj is None: if obj is None:
print '*** Object', old, 'not found!' print('*** Object', old, 'not found!')
return return
renamer = IContainerItemRenamer(container) renamer = IContainerItemRenamer(container)
if new != old: if new != old:
try: try:
renamer.renameItem(old, new) renamer.renameItem(old, new)
except DuplicationError: except DuplicationError:
print '*** Object', new, 'already exists!' print('*** Object', new, 'already exists!')
# container[new] = obj # container[new] = obj
# notifyAdded(obj) # notifyAdded(obj)
notifyModification(obj) notifyModification(obj)
@ -110,7 +110,7 @@ def rename(container, old, new, docommit=True):
def move(source, target, name): def move(source, target, name):
obj = source.get(name) obj = source.get(name)
if obj is None: if obj is None:
print '*** Object', name, 'not found!' print('*** Object', name, 'not found!')
return return
#notifyRemoved(obj) #notifyRemoved(obj)
#del source[name] #del source[name]
@ -124,14 +124,14 @@ def get(container, obj):
name = obj name = obj
obj = container.get(name) obj = container.get(name)
if obj is None: if obj is None:
print '*** Object', name, 'not found!' print('*** Object', name, 'not found!')
return None return None
return adapted(obj) return adapted(obj)
# startup, loop, finish... # startup, loop, finish...
def startup(msg, **kw): def startup(msg, **kw):
print '***', msg print('***', msg)
step = kw.pop('step', 10) step = kw.pop('step', 10)
return Jeep(count=0, step=step, message=msg, **kw) return Jeep(count=0, step=step, message=msg, **kw)
@ -148,20 +148,20 @@ def update(fct, obj, info):
objInfo = obj.context.__name__ objInfo = obj.context.__name__
except: except:
objInfo = obj objInfo = obj
print '*** Processing object # %i: %s' % (info.count, objInfo) print('*** Processing object # %i: %s' % (info.count, objInfo))
if info.get('updated'): if info.get('updated'):
print '*** updated: %i.' % info.updated print('*** updated: %i.' % info.updated)
if info.get('errors'): if info.get('errors'):
print '*** errors: %i.' % info.error print('*** errors: %i.' % info.error)
commit() commit()
return fct(obj, info) return fct(obj, info)
def finish(info): def finish(info):
print '*** count: %i.' % info.count print('*** count: %i.' % info.count)
if info.get('updated'): if info.get('updated'):
print '*** updated: %i.' % info.updated print('*** updated: %i.' % info.updated)
if info.get('errors'): if info.get('errors'):
print '*** errors: %i.' % info.error print('*** errors: %i.' % info.error)
commit() commit()
def stop_condition(info): def stop_condition(info):

31
loops/query.py
View file

@ -1,31 +1,14 @@
# # loops.query
# Copyright (c) 2013 Helmut Merz helmutm@cy55.de
#
# 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 Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
""" """ Query management stuff.
Query management stuff.
""" """
from BTrees.IOBTree import IOBTree from BTrees.IOBTree import IOBTree
from BTrees.IFBTree import weightedIntersection, weightedUnion, IFBucket from BTrees.IFBTree import weightedIntersection, weightedUnion, IFBucket
from zope import schema, component from zope import schema, component
from zope.interface import Interface, Attribute, implements from zope.interface import Interface, Attribute, implementer
from zope.app.catalog.interfaces import ICatalog
from zope.cachedescriptors.property import Lazy from zope.cachedescriptors.property import Lazy
from zope.catalog.interfaces import ICatalog
from zope.intid.interfaces import IIntIds from zope.intid.interfaces import IIntIds
from cybertools.typology.interfaces import IType from cybertools.typology.interfaces import IType
@ -58,10 +41,9 @@ class IQuery(Interface):
""" """
@implementer(IQuery)
class BaseQuery(object): class BaseQuery(object):
implements(IQuery)
def __init__(self, context): def __init__(self, context):
self.context = context self.context = context
@ -194,10 +176,9 @@ class IQueryConcept(IConceptSchema, ILoopsAdapter, IOptions):
required=False) required=False)
@implementer(IQueryConcept)
class QueryConcept(AdapterBase): class QueryConcept(AdapterBase):
implements(IQueryConcept)
_contextAttributes = AdapterBase._contextAttributes + ['viewName'] _contextAttributes = AdapterBase._contextAttributes + ['viewName']
_adapterAttributes = AdapterBase._adapterAttributes + ('options',) _adapterAttributes = AdapterBase._adapterAttributes + ('options',)

31
loops/repair/base.py
View file

@ -1,23 +1,6 @@
# # loops.repair.base
# Copyright (c) 2016 Helmut Merz helmutm@cy55.de
#
# 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 Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
""" """ Basic stuff for database fixes.
Basic stuff for database fixes.
""" """
import os import os
@ -33,7 +16,7 @@ os.environ['NLS_LANG'] = 'German_Germany.UTF8'
# start, loop, finish... # start, loop, finish...
def startup(msg, **kw): def startup(msg, **kw):
print '***', msg print('***', msg)
step = kw.pop('step', 10) step = kw.pop('step', 10)
return Jeep(count=0, step=step, message=msg, **kw) return Jeep(count=0, step=step, message=msg, **kw)
@ -50,16 +33,16 @@ def update(fct, obj, info):
objInfo = obj.context.__name__ objInfo = obj.context.__name__
except: except:
objInfo = obj objInfo = obj
print '*** Processing object # %i: %s.' % (info.count, objInfo) print( '*** Processing object # %i: %s.' % (info.count, objInfo))
if info.get('updated'): if info.get('updated'):
print '*** updated: %i.' % info.updated print('*** updated: %i.' % info.updated)
psu.commit() psu.commit()
return fct(obj, info) return fct(obj, info)
def finish(info): def finish(info):
print '*** count: %i.' % info.count print('*** count: %i.' % info.count)
if info.get('updated'): if info.get('updated'):
print '*** updated: %i.' % info.updated print('*** updated: %i.' % info.updated)
psu.commit() psu.commit()
def stop_condition(info): def stop_condition(info):

36
loops/security/browser/admin.py
View file

@ -1,37 +1,19 @@
# # loops.security.browser.admin
# Copyright (c) 2013 Helmut Merz helmutm@cy55.de
#
# 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 Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
""" """ Security-related views.
Security-related views.
""" """
from zope.app.authentication.groupfolder import GroupInformation from zope.app.authentication.browser import granting
from zope.app.pagetemplate import ViewPageTemplateFile from zope.app.authentication.browser.rolepermissionview import RolePermissionView
from zope.app.security.interfaces import IPermission from zope.browserpage import ViewPageTemplateFile
from zope.app.security.settings import Allow, Deny, Unset from zope.cachedescriptors.property import Lazy
from zope.app.securitypolicy.browser import granting
from zope.app.securitypolicy.browser.rolepermissionview import RolePermissionView
from zope import component from zope import component
from zope.event import notify from zope.event import notify
from zope.interface import implements
from zope.cachedescriptors.property import Lazy
from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
from zope.pluggableauth.plugins.groupfolder import GroupInformation
from zope.security.interfaces import IPermission
from zope.security.proxy import removeSecurityProxy from zope.security.proxy import removeSecurityProxy
from zope.securitypolicy.settings import Allow, Deny, Unset
from zope.securitypolicy.interfaces import IPrincipalRoleManager, \ from zope.securitypolicy.interfaces import IPrincipalRoleManager, \
IRolePermissionMap IRolePermissionMap
from zope.securitypolicy.interfaces import IPrincipalPermissionManager, \ from zope.securitypolicy.interfaces import IPrincipalPermissionManager, \

2
loops/util.py
View file

@ -175,7 +175,7 @@ def getMigratedItem(uid, storage):
def getObjectForUid(uid, intIds=None): def getObjectForUid(uid, intIds=None):
if uid == '*': # wild card if uid == '*': # wild card
return '*' return '*'
if isinstance(uid, basestring) and not uid.isdigit(): # not a valid uid if isinstance(uid, str) and not uid.isdigit(): # not a valid uid
return None return None
if intIds is None: if intIds is None:
intIds = component.getUtility(IIntIds) intIds = component.getUtility(IIntIds)

1
pyproject.toml
View file

@ -17,6 +17,7 @@ dependencies = [
"markdown", "markdown",
"python-dotenv", "python-dotenv",
"zope.app.renderer", "zope.app.renderer",
"zope.app.authentication",
"zope.browsermenu", "zope.browsermenu",
"zope.i18n", "zope.i18n",
"zope.pluggableauth", "zope.pluggableauth",