Changeset 12 in feed2telegram for trunk

Timestamp:

08/24/18 12:41:40 (6 years ago)

Author:

cheese

Message:

#1 change feedparser.parse to requests for timeout

Location:

trunk

Files:

• feed2telegram.py (modified) (2 diffs)
• implements/hikarinoakariost_feeder.py (modified) (1 diff)

trunk/feed2telegram.py

@@ -120 +120 @@
 
     def get(self):
-        self.feed = feedparser.parse(self.url)# , etag=self.etag, modified=self.modified)
+        try:
+            resp = requests.get(self.url, timeout=10.0)
+        except requests.ReadTimeout as e:
+            raise
+
+        # self.feed = feedparser.parse(self.url)# , etag=self.etag, modified=self.modified)
+        self.feed = feedparser.parse(resp.content)
 
         try:
@@ -187 +193 @@
         self.last_modified = self.feed.modified
         feed = self.feed.get()
-        
+
         for entry in self.get_entries(feed.entries):
             if self.stop_event.is_set():
                 break
-        
+
             if not self.isSendingEntry(entry):
                 continue
-        
+
             message = self.get_message(entry)
             self.telegram.sendMessage(message)
-        
+
         self.feed.save()
 

trunk/implements/hikarinoakariost_feeder.py

@@ -10 +10 @@
               chat_id,
               lambda entry: entry['link'],
-              callback_get_entries=lambda entries: reversed(entries),
               continue_on_error=True,
              ).start()