(?P<title>.*?)

Index: /lang/python/twopy/trunk/twopy/errors.py =================================================================== --- /lang/python/twopy/trunk/twopy/errors.py (revision 36813) +++ /lang/python/twopy/trunk/twopy/errors.py (revision 36846) @@ -40,19 +40,19 @@ class Message (object): __title_re = re.compile("(?P<title>.*?)") - __body_re = re.compile("(?P.*?)") + __body_re = re.compile("(?P.*?)") def __init__(self, dat): if type(dat) == str or type(dat) == unicode: self.__title = Message.__title_re.search(dat).group("title") - self.__body = Message.__body_re.search(dat).group("body") + self.__body = Message.__body_re.search(dat).group("body") elif type(dat) == tuple or type(dat) == list: self.__title = dat[0] - self.__body = dat[1] + self.__body = dat[1] elif type(dat) == dict: self.__title = dat["title"] - self.__body = dat["body"] + self.__body = dat["body"] else: self.__title = "" - self.__body = "" + self.__body = "" def getTitle(self): Index: /lang/python/twopy/trunk/twopy/user.py =================================================================== --- /lang/python/twopy/trunk/twopy/user.py (revision 36813) +++ /lang/python/twopy/trunk/twopy/user.py (revision 36846) @@ -15,10 +15,7 @@ return User() - def __init__(self, - user_agent="Monazilla 1.00", - language="ja", - keep_alive=300): + def __init__(self, user_agent="Monazilla 1.00", language="ja", keep_alive=300): self.user_agent = user_agent - self.language = language + self.language = language self.keep_alive = keep_alive Index: /lang/python/twopy/trunk/twopy/comment.py =================================================================== --- /lang/python/twopy/trunk/twopy/comment.py (revision 36813) +++ /lang/python/twopy/trunk/twopy/comment.py (revision 36846) @@ -67,9 +67,9 @@ return self.__date date = property(getDate) - + def getBody(self): return self.__body body = property(getBody) - + def getDatetime(self): if self.__datetime_cache: @@ -78,13 +78,13 @@ result = Comment.__datetime.search(self.__date) if result: - year = int(result.group("year")) + year = int(result.group("year")) month = int(result.group("month")) - day = int(result.group("day")) - hour = int(result.group("hour")) - m = int(result.group("min")) - sec = int(result.group("sec")) - c = result.group("csec") - csec = c == None and 0 or int(c) - + day = int(result.group("day")) + hour = int(result.group("hour")) + m = int(result.group("min")) + sec = int(result.group("sec")) + c = result.group("csec") + csec = 0 if c else int(c) + d = datetime.datetime(year, month, day, hour, m, sec, csec * 10000) self.__datetime_cache = d @@ -93,13 +93,13 @@ return None datetime = property(getDatetime) - + def getID(self): return self.__id ID = property(getID) - + def getBe(self): return self.__be be = property(getBe) - + def extractUrls(self): """ @@ -113,5 +113,5 @@ return l urls = property(extractUrls) - + def extractResponses(self, returnType="str"): """ @@ -122,5 +122,5 @@ l = [(r.group(1), r.group(2)) for r in result] self.__responses_cache = l - + l = self.__responses_cache if returnType == "str": @@ -129,5 +129,5 @@ return self.__makeIntegerLists(l) elif returnType == "comment": - rl = self.__makeIntegerLists(l) + rl = self.__makeIntegerLists(l) rl2 = [] for i in rl: @@ -165,5 +165,5 @@ (self.number, self.name, self.mailaddr, self.date, self.ID) return u"%s\n%s\n" % (header, self.body) - + def __unicode__(self): return self.render() Index: /lang/python/twopy/trunk/twopy/utility.py =================================================================== --- /lang/python/twopy/trunk/twopy/utility.py (revision 36813) +++ /lang/python/twopy/trunk/twopy/utility.py (revision 36846) @@ -4,14 +4,14 @@ import re -STATUS_FALSE = 0 -STATUS_TRUE = 1 -STATUS_ERROR = 2 -STATUS_CHECK = 3 +STATUS_FALSE = 0 +STATUS_TRUE = 1 +STATUS_ERROR = 2 +STATUS_CHECK = 3 STATUS_COOKIE = 4 -__status_false = re.compile(u"2ch_X:false") -__status_true = re.compile(u"(2ch_X:true|書きこみました)") -__status_error = re.compile(u"(2ch_X:error|ＥＲＲＯＲ)") -__status_check = re.compile(u"2ch_X:check") +__status_false = re.compile(u"2ch_X:false") +__status_true = re.compile(u"(2ch_X:true|書きこみました)") +__status_error = re.compile(u"(2ch_X:error|ＥＲＲＯＲ)") +__status_check = re.compile(u"2ch_X:check") __status_cookie = re.compile(u"(2ch_X:cookie|書き込み確認)") Index: /lang/python/twopy/trunk/twopy/board.py =================================================================== --- /lang/python/twopy/trunk/twopy/board.py (revision 36813) +++ /lang/python/twopy/trunk/twopy/board.py (revision 36846) @@ -27,6 +27,6 @@ """ u = url.endswith("/") and url or url + "/" - self.__url = u - self.__user = user or twopy.User.anonymouse() + self.__url = u + self.__user = user if user else twopy.User.anonymouse() self.__isRetrieved = False @@ -52,6 +52,6 @@ def getSubject(self): - su = self.url.endswith("/") and \ - self.url + "subject.txt" or self.url + "/subject.txt" + su = self.url + "subject.txt" if self.url.endswith("/") \ + else self.url + "/subject.txt" return su subject_url = property(getSubject) @@ -100,5 +100,5 @@ r = Board.__tr_re.search(columns[1]) title = r.group("title") - res = int(r.group("res")) + res = int(r.group("res")) th = twopy.Thread(self, columns[0], self.user, title, res) self.__threads.append(th) Index: /lang/python/twopy/trunk/twopy/thread.py =================================================================== --- /lang/python/twopy/trunk/twopy/thread.py (revision 36813) +++ /lang/python/twopy/trunk/twopy/thread.py (revision 36846) @@ -65,5 +65,5 @@ assert rs, Exception("this url is not valid.") - server = rs.group(1) + server = rs.group(1) board_name = rs.group(2) dat_number = rs.group(3) @@ -90,7 +90,7 @@ self.__comments = [] - self.__isBroken = False + self.__isBroken = False self.__last_modified = None - self.__etag = None + self.__etag = None def __init_thread(self): @@ -131,5 +131,5 @@ return self.__initialResNumber response = property(getResponse) - res = property(getResponse) + res = property(getResponse) def getPosition(self): @@ -193,5 +193,5 @@ raise twopy.DatoutError, twopy.Message(self.__rawdat) self.__parseDatToComments(unicode(self.__rawdat, "Shift_JIS", "replace")) - self.__isBroken = False + self.__isBroken = False self.__res = len(self.__comments) elif response.code == 203: