X-Git-Url: http://git.sourceforge.jp/view?p=fukui-no-namari%2Ffukui-no-namari.git;a=blobdiff_plain;f=src%2FFukuiNoNamari%2FBbsType%2Fbbs_type_base.py;h=00834baa01e557ced3b39aa8e7d3fa5faf3b6d05;hp=2bd1dd37f22eddea3530464b5c9b78d66a03576c;hb=ffe94376349ec9591d52f15e86c090c70a670499;hpb=85761b604769f507ff12ce2758d693c02bffdd50 diff --git a/src/FukuiNoNamari/BbsType/bbs_type_base.py b/src/FukuiNoNamari/BbsType/bbs_type_base.py index 2bd1dd3..00834ba 100644 --- a/src/FukuiNoNamari/BbsType/bbs_type_base.py +++ b/src/FukuiNoNamari/BbsType/bbs_type_base.py @@ -22,8 +22,8 @@ import codecs from bbs_type_exception import BbsTypeError -subject_reg_expr = re.compile("(?P.*).dat<>(?P.*)\((?P<res>\d*)\)") -dat_reg_expr = re.compile("(?P<name>.*)<>(?P<mail>.*)<>(?P<date>.*)<>(?P<msg>.*)<>(?P<title>.*)") +subject_reg_expr = re.compile("(?P<id>(?:(?!<>).)*).dat<>(?P<title>(?:(?!<>).)*)\((?P<res>\d*)\)") +dat_reg_expr = re.compile("(?P<name>(?:(?!<>).)*)<>(?P<mail>(?:(?!<>).)*)<>(?P<date>(?:(?!<>).)*)<>(?P<msg>(?:(?!<>).)*)<>(?P<title>(?:(?!<>).)*)") class BaseType: