From a7052883ca4f136bf8c5708221f60d46acea913b Mon Sep 17 00:00:00 2001 From: Christian Meier Date: Tue, 1 Oct 2024 15:35:29 +0200 Subject: [PATCH] fix(headless): Renamed fallback method --- Products/zms/_cachemanager.py | 12 ++++++------ Products/zms/_exportable.py | 4 ++-- Products/zms/_objattrs.py | 12 ++++++------ Products/zms/_pathhandler.py | 6 +++--- Products/zms/_textformatmanager.py | 4 ++-- Products/zms/_zreferableitem.py | 12 ++++++------ Products/zms/standard.py | 6 +++--- Products/zms/zmslinkelement.py | 16 ++++++++-------- Products/zms/zmsobject.py | 4 ++-- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Products/zms/_cachemanager.py b/Products/zms/_cachemanager.py index 9e054f6cf..abf4972df 100644 --- a/Products/zms/_cachemanager.py +++ b/Products/zms/_cachemanager.py @@ -40,8 +40,8 @@ def getReqBuffId(self, key): # Clear buffered values from Http-Request. # -------------------------------------------------------------------------- def clearReqBuff(self, prefix='', REQUEST=None): - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) buff = request.get('__buff__', Buff()) reqBuffId = self.getReqBuffId(prefix) if len(prefix) > 0: @@ -58,8 +58,8 @@ def clearReqBuff(self, prefix='', REQUEST=None): # @throws Exception # -------------------------------------------------------------------------- def fetchReqBuff(self, key, REQUEST=None): - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) buff = request['__buff__'] reqBuffId = self.getReqBuffId(key) return getattr(buff, reqBuffId) @@ -70,8 +70,8 @@ def fetchReqBuff(self, key, REQUEST=None): # Returns value and stores it in buffer of Http-Request. # -------------------------------------------------------------------------- def storeReqBuff(self, key, value, REQUEST=None): - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) buff = request.get('__buff__', None) if buff is None: buff = Buff() diff --git a/Products/zms/_exportable.py b/Products/zms/_exportable.py index d1f6b5499..8ba2555b8 100644 --- a/Products/zms/_exportable.py +++ b/Products/zms/_exportable.py @@ -384,9 +384,9 @@ def toXhtml(self, REQUEST, deep=True): # Exportable.toXml: # -------------------------------------------------------------------------- def toXml(self, REQUEST=None, deep=True, data2hex=False, multilang=True): - from Products.zms.standard import create_fake_http_request + from Products.zms.standard import create_headless_http_request if REQUEST is None: - REQUEST = self.get('REQUEST', create_fake_http_request()) + REQUEST = self.get('REQUEST', create_headless_http_request()) xml = '' xml += _xmllib.xml_header() xml += _xmllib.getObjToXml( self, REQUEST, deep, base_path='', data2hex=data2hex, multilang=multilang) diff --git a/Products/zms/_objattrs.py b/Products/zms/_objattrs.py index 236c23e35..00c9cc98e 100644 --- a/Products/zms/_objattrs.py +++ b/Products/zms/_objattrs.py @@ -37,8 +37,8 @@ # getobjattrdefault # ------------------------------------------------------------------------------ def getobjattrdefault(obj, obj_attr, lang): - from Products.zms.standard import create_fake_http_request - request = obj.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = obj.get('REQUEST', create_headless_http_request()) v = None datatype = obj_attr['datatype_key'] default = None @@ -597,8 +597,8 @@ def getObjProperty(self, key, REQUEST={}, par=None): # attr({key0:value0,...,keyN:valueN}) -> setObjProperty(key0,value0),... # -------------------------------------------------------------------------- def attr(self, *args, **kwargs): - from Products.zms.standard import create_fake_http_request - req = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + req = self.get('REQUEST', create_headless_http_request()) request = kwargs.get('request',kwargs.get('REQUEST',req)) if len(args) == 1 and isinstance(args[0], str): return self.getObjProperty( args[0], request, kwargs) @@ -613,8 +613,8 @@ def attr(self, *args, **kwargs): # ObjAttrs.evalMetaobjAttr # -------------------------------------------------------------------------- def evalMetaobjAttr(self, *args, **kwargs): - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) root = self key = args[0] id = standard.nvl(request.get('ZMS_INSERT'), self.meta_id) diff --git a/Products/zms/_pathhandler.py b/Products/zms/_pathhandler.py index 4b84a45af..71e1828ed 100644 --- a/Products/zms/_pathhandler.py +++ b/Products/zms/_pathhandler.py @@ -119,8 +119,8 @@ class PathHandler(object): def __bobo_traverse__(self, TraversalRequest, name): # If this is the first time this __bob_traverse__ method has been called # in handling this traversal request, store the path_to_handle - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) url = request.get('URL', '') zmi = url.find('/manage') >= 0 @@ -343,7 +343,7 @@ def __bobo_traverse__(self, TraversalRequest, name): request.set('lang', lang) return self - # Products.zms.standard.create_fake_http_request() + # Products.zms.standard.create_headless_http_request() # has been called above for headless mode if request.get('SERVER_NAME') == 'nohost': return diff --git a/Products/zms/_textformatmanager.py b/Products/zms/_textformatmanager.py index c8a517bc1..0fc16dff0 100644 --- a/Products/zms/_textformatmanager.py +++ b/Products/zms/_textformatmanager.py @@ -29,8 +29,8 @@ class TextFormatObject(object): # Returns section-number. # ---------------------------------------------------------------------------- def getSecNo( self): - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) sec_no = '' #-- [ReqBuff]: Fetch buffered value from Http-Request. parentNode = self.getParentNode() diff --git a/Products/zms/_zreferableitem.py b/Products/zms/_zreferableitem.py index d52b7fb77..4f409a124 100644 --- a/Products/zms/_zreferableitem.py +++ b/Products/zms/_zreferableitem.py @@ -46,8 +46,8 @@ def getInternalLinkDict(self, url): reqBuffId = 'getInternalLinkDict.%s'%url try: return docelmnt.fetchReqBuff(reqBuffId) except: pass - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) d = {} # Params. anchor = '' @@ -88,8 +88,8 @@ def getInternalLinkDict(self, url): # getInternalLinkUrl: # ------------------------------------------------------------------------------ def getInternalLinkUrl(self, url, ob): - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) if ob is None: index_html = './index_%s.html?error_type=NotFound&op=not_found&url=%s'%(request.get('lang', self.getPrimaryLanguage()), str(url)) else: @@ -390,8 +390,8 @@ def findObject(self, url): # Resolves internal/external links and returns Object. # ---------------------------------------------------------------------------- def getLinkObj(self, url, REQUEST=None): - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) ob = None if isInternalLink(url): # Params. diff --git a/Products/zms/standard.py b/Products/zms/standard.py index f79e69977..a710a1914 100644 --- a/Products/zms/standard.py +++ b/Products/zms/standard.py @@ -861,7 +861,7 @@ def triggerEvent(context, *args, **kwargs): """ Hook for trigger of custom event (if there is one) """ - request = context.get('REQUEST', create_fake_http_request()) + request = context.get('REQUEST', create_headless_http_request()) l = [] name = args[0] root = context.getRootElement() @@ -957,7 +957,7 @@ def unescape(s): return s -def create_fake_http_request(): +def create_headless_http_request(): """ Returns a ZPublisher.HTTPRequest object to be used in headless mode. """ @@ -2382,7 +2382,7 @@ def _cook_check(self): pt = StaticPageTemplateFile(filename='None') pt.setText(text) pt.setEnv(context, options) - request = context.get('REQUEST', create_fake_http_request()) + request = context.get('REQUEST', create_headless_http_request()) rendered = pt.pt_render(extra_context={'here':context,'request':request}) return rendered diff --git a/Products/zms/zmslinkelement.py b/Products/zms/zmslinkelement.py index 11984b5c6..5e798ccf0 100644 --- a/Products/zms/zmslinkelement.py +++ b/Products/zms/zmslinkelement.py @@ -103,8 +103,8 @@ def getSelf(self, meta_type=None): # ZMSLinkElement.getEmbedType: # -------------------------------------------------------------------------- def getEmbedType(self): - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) embed_type = self.getObjAttrValue( self.getObjAttr( 'attr_type'), request) if embed_type in [ 'embed', 'recursive', 'remote']: ref_obj = self.getRefObj() @@ -383,8 +383,8 @@ def isPage(self): # ZMSLinkElement.isPageElement # -------------------------------------------------------------------------- def isPageElement(self): - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) rtnVal = False if self.getEmbedType() == 'remote': return self.getRemoteObj().get('is_page_element',False) @@ -633,8 +633,8 @@ def initProxy(self, base, url_base, proxy, recursive=False): # Returns self or referenced object (if embedded) as ZMSProxyObject # -------------------------------------------------------------------------- def __proxy__(self): - from Products.zms.standard import create_fake_http_request - req = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + req = self.get('REQUEST', create_headless_http_request()) rtn = self if req.get( 'ZMS_PROXY', True): if req.get( 'URL', '').find( '/manage') < 0 or req.get( 'ZMS_PATH_HANDLER', False): @@ -653,8 +653,8 @@ def __proxy__(self): # ZMSProxyObject. # -------------------------------------------------------------------------- def getProxy(self): - from Products.zms.standard import create_fake_http_request - req = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + req = self.get('REQUEST', create_headless_http_request()) rtn = self if req.get( 'ZMS_PROXY', True): rtn = req.get( 'ZMS_PROXY_%s'%self.id, self.__proxy__()) diff --git a/Products/zms/zmsobject.py b/Products/zms/zmsobject.py index 20aeca7a8..46c1ecc2f 100644 --- a/Products/zms/zmsobject.py +++ b/Products/zms/zmsobject.py @@ -494,8 +494,8 @@ def is_visible(self): # Returns 1 if current object is visible. # -------------------------------------------------------------------------- def isVisible(self, REQUEST): - from Products.zms.standard import create_fake_http_request - request = self.get('REQUEST', create_fake_http_request()) + from Products.zms.standard import create_headless_http_request + request = self.get('REQUEST', create_headless_http_request()) REQUEST = standard.nvl(REQUEST, request) lang = standard.nvl(REQUEST.get('lang'), self.getPrimaryLanguage()) visible = True