# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1433784046 -7200
# Node ID 03e3ebb1d52fa83a5e5b4cd9fe953316bbe7a0ad
# Parent  e0e7459556bcc462843e21e31eb3776935a2ca2d
Disable the use of a proxy when updating feeds - https traffic does not seem to work currently over a proxy.

diff -r e0e7459556bc -r 03e3ebb1d52f backend/AbstractFeedUpdater.py
--- a/backend/AbstractFeedUpdater.py	Tue Apr 28 02:50:57 2015 +0200
+++ b/backend/AbstractFeedUpdater.py	Mon Jun 08 19:20:46 2015 +0200
@@ -25,13 +25,15 @@
         self._processEntries(result)
 
     def _retrieveFeed(self):
-        if self.preferences.isProxyConfigured():
-            proxyUrl = "http://%s:%i" % (self.preferences.proxyHost(), self.preferences.proxyPort())
-            proxyHandler = ProxyHandler({"http": proxyUrl})
-            result = feedparser.parse(self.feed.rss_url, handlers=[proxyHandler])
-        else:
-            # when updating to python3 see http://code.google.com/p/feedparser/issues/detail?id=260
-            result = feedparser.parse(self.feed.rss_url)
+        # Retrieving https connections over a proxy does not seem to work currently
+        #if self.preferences.isProxyConfigured():
+        #    proxyUrl = '{0}:{1}'.format(self.preferences.proxyHost(), self.preferences.proxyPort())
+        #    proxyHandler = ProxyHandler({'http': proxyUrl, 'https': proxyUrl})
+        #    result = feedparser.parse(self.feed.rss_url, handlers=[proxyHandler])
+        #else:
+        #    # when updating to python3 see http://code.google.com/p/feedparser/issues/detail?id=260
+        result = feedparser.parse(self.feed.rss_url)
+        print(result)
         # bozo flags if a feed is well-formed.
 #        if result["bozo"] > 0:
 #            raise FeedUpdateException()