From e2ab59bcc441d48a327ca2a1d9a729a773a9aa78 Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli Date: Tue, 14 Jul 2015 10:35:54 +0200 Subject: [PATCH] Added public attribute with relation name regexp Also simplified the function to check whether a name is valid for a relation. --- relational/rtypes.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/relational/rtypes.py b/relational/rtypes.py index d0b9bed..115e4ff 100644 --- a/relational/rtypes.py +++ b/relational/rtypes.py @@ -24,6 +24,7 @@ import datetime import re +RELATION_NAME_REGEXP = r'^[_a-zA-Z]+[_a-zA-Z0-9]*$' class rstring (str): @@ -160,7 +161,4 @@ class rdate (object): def is_valid_relation_name(name): '''Checks if a name is valid for a relation. Returns boolean''' - if re.match(r'^[_a-zA-Z]+[_a-zA-Z0-9]*$', name) == None: - return False - else: - return True + return re.match(RELATION_NAME_REGEXP, name) != None