Changeset 34400

Timestamp:

07/12/09 15:11:08 (4 years ago)

Author:

rezoo

Message:

変更点(r34397:r34399)をtrunkにマージ

Location:

lang/python/twopy/trunk

Files:

• . (modified) (1 prop)
• twopy/board.py (modified) (3 diffs)
• twopy/thread.py (modified) (2 diffs)

lang/python/twopy/trunk/twopy/board.py

@@ -23 +23 @@
                 u = url.endswith("/") and url or url + "/"
                 self.__url  = u
-                self.__user = user or User.anonymouse()
+                self.__user = user or twopy.User.anonymouse()
                 self.__isRetrieved = False
                 
@@ -74 +74 @@
                 self.__init_threads()
                 
-                response = self.user.urlopen(self.subject_url, gzip=False)
+                try:
+                        response = self.user.urlopen(self.subject_url, gzip=False)
+                except urllib2.HTTPError, e:
+                        return e.code
                 if response.code == 200:
                         rawdata = unicode(response.read(), 'Shift_JIS', 'ignore')
@@ -87 +90 @@
                                 self.__threads.append(th)
                         self.__isRetrieved = True
-                else: raise TypeError
+                
+                return response.code
         
         def createNewThread(self, subject=u"", name=u"", mailaddr=u"", message=u"",

lang/python/twopy/trunk/twopy/thread.py

@@ -132 +132 @@
                         self.__isBroken   = False
                         self.__res = len(self.__comments)
+                return response.code
         
         def __appendComments(self, dat):
@@ -232 +233 @@
         
         def __iter__(self):
-                if not self.isRetrieved: raise NotRetrievedError
+                if not self.isRetrieved: raise twopy.NotRetrievedError
                 for comment in self.__comments:
                         yield comment
         
         def __len__(self):
-                if not self.isRetrieved: raise NotRetrievedError
+                if not self.isRetrieved: raise twopy.NotRetrievedError
                 return len(self.__comments)
         
         def __getitem__(self, i):
-                if not self.isRetrieved: raise NotRetrievedError
+                if not self.isRetrieved: raise twopy.NotRetrievedError
                 return self.__comments[i-1]