From 20dfdae234729cb25711256a5d31bfe0c3f86462 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Tue, 14 Apr 2009 18:48:38 +0000 Subject: [PATCH] use 'invalid' instead of 'illegal'. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26413 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_core/Base_getCategoriesSpreadSheetMapping.xml | 2 +- product/ERP5Type/Utils.py | 4 ++-- product/ZSQLCatalog/SearchText/lexer.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml index 99ff6a0d29..8ade5fbb42 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml @@ -269,7 +269,7 @@ for table_name in spreadsheets.keys():\n if clean_title != cell_id:\n category_properties[\'title\'] = clean_title\n \n - # Detect illegal IDs\n + # Detect invalid IDs\n if path_element_id in property_id_list:\n invalid_spreadsheet_error_handler(translateString(\n "The ID ${id} is invalid, it\'s a reserved property name",\n diff --git a/product/ERP5Type/Utils.py b/product/ERP5Type/Utils.py index abe3b7cd4f..e159f8b7e4 100644 --- a/product/ERP5Type/Utils.py +++ b/product/ERP5Type/Utils.py @@ -1317,7 +1317,7 @@ def setDefaultProperties(property_holder, object=None, portal=None): read_permission=read_permission, write_permission=write_permission) else: - raise TypeError, '"%s" is illegal type for propertysheet' % \ + raise TypeError, '"%s" is invalid type for propertysheet' % \ prop['type'] # Create Category Accessors for cat in cat_list: @@ -1453,7 +1453,7 @@ def setDefaultProperties(property_holder, object=None, portal=None): # # setattr(property_holder, prop['id'], defaults[prop['type']]) # pass else: - raise TypeError, '"%s" is illegal type for propertysheet' % \ + raise TypeError, '"%s" is invalid type for propertysheet' % \ prop['type'] ########################################## diff --git a/product/ZSQLCatalog/SearchText/lexer.py b/product/ZSQLCatalog/SearchText/lexer.py index ad6ac0c126..2da29fa7fa 100644 --- a/product/ZSQLCatalog/SearchText/lexer.py +++ b/product/ZSQLCatalog/SearchText/lexer.py @@ -65,7 +65,7 @@ class lexer(object): LOG('lexer', 0, line) def t_error(self, t): - raise LexerError, 'ERROR: Illegal character %r' % (t.value[0], ) + raise LexerError, 'ERROR: Invalid character %r' % (t.value[0], ) def p_error(self, p): raise ParserError, 'Syntax error in input: %r' % (p, ) -- 2.30.9