[Erp5-report] r13567 - /erp5/trunk/products/ERP5/Document/Url.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Mar 22 15:45:05 CET 2007
Author: jp
Date: Thu Mar 22 15:45:01 2007
New Revision: 13567
URL: http://svn.erp5.org?rev=13567&view=rev
Log:
Added some default values in dictionnaries.
Modified:
erp5/trunk/products/ERP5/Document/Url.py
Modified: erp5/trunk/products/ERP5/Document/Url.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Url.py?rev=13567&r1=13566&r2=13567&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Url.py (original)
+++ erp5/trunk/products/ERP5/Document/Url.py Thu Mar 22 15:45:01 2007
@@ -36,15 +36,16 @@
from mimetools import choose_boundary
from mimetypes import guess_type
+no_crawl_protocol_list = ['mailto', 'javascript', ]
+no_host_protocol_list = ['mailto', 'news', 'javascript',]
+default_protocol_dict = { 'Email' : 'mailto',
+ }
+
class UrlMixIn:
# Declarative security
security = ClassSecurityInfo()
security.declareObjectProtected(Permissions.AccessContentsInformation)
-
- no_host_protocol_list = ['mailto', 'news', ]
- default_protocol_dict = { 'Email' : 'mailto',
- }
security.declareProtected(Permissions.AccessContentsInformation,
'asURL')
@@ -57,12 +58,12 @@
# A quick fix for all objects which did not
# define protocol such as email addresses
ptype = self.getPortalType()
- if UrlMixIn.default_protocol_dict.has_key(ptype):
- protocol = UrlMixIn.default_protocol_dict[ptype]
+ if default_protocol_dict.has_key(ptype):
+ protocol = default_protocol_dict[ptype]
else:
protocol = 'http'
url_string = self.getUrlString()
- if protocol in UrlMixIn.no_host_protocol_list or url_string.startswith('//'):
+ if protocol in no_host_protocol_list or url_string.startswith('//'):
return '%s:%s' % (protocol, url_string)
return '%s://%s' % (protocol, url_string)
More information about the Erp5-report
mailing list