Merge lp:~verterok/unity-scope-yahoostock/ystock-logging into lp:unity-scope-yahoostock

[Guillermo Gonzalez]

Add basic logging (replace print with logging)

Add basic logging (replace print with logging)

[David Callé (davidc3)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/unity-scope-yahoostock-ci/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-yahoostock-saucy-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-yahoostock-saucy-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-yahoostock-saucy-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-yahoostock-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verterok/unity-scope-yahoostock/ystock-logging]

56. By Guillermo Gonzalez on 2013-09-25

fix test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/unity-scope-yahoostock-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-yahoostock-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-yahoostock-saucy-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-yahoostock-saucy-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-yahoostock-ci/9/rebuild

review: Approve (continuous-integration)

=== modified file 'src/unity_yahoostock_daemon.py'
--- src/unity_yahoostock_daemon.py	2013-05-22 20:06:13 +0000
+++ src/unity_yahoostock_daemon.py	2013-09-25 19:11:08 +0000
@@ -15,12 +15,14 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gi.repository import Unity, UnityExtras
-from gi.repository import Gio, GLib
+from gi.repository import Unity
+from gi.repository import Gio
 import urllib.parse
 import urllib.request
 import feedparser
 import gettext
+import logging
+
 from datetime import datetime
 
 
@@ -69,6 +71,8 @@
 # Test injection
 FAKE_CALL = False
 
+logger = logging.getLogger("unity.scope.yahoostock")
+
 def search(search, filters):
     '''
     Any search method returning results as a list of tuples.
@@ -87,14 +91,16 @@
     if not search:
         return results
     ys = Yahoostock()
+    logger.debug("Getting quotes for: %r", search)
     quotes = ys.getQuotes(urllib.parse.quote(search))
+    logger.debug("Found %s quotes.", len(quotes))
     for quote in quotes:
         volume_str = ys.getVolumeStr(quote['volume'])
         change_str = ys.getChangeStr(quote['change'])
         comment = "%s\n%s@%s\n%s\n%s" % (quote['name'],
                   quote['lastVal'], quote['lastTime'],
                   volume_str, change_str)
-        print (quote['symbol'])
+        logger.debug("quote: %s - %s", quote['symbol'], search)
         if quote['name'] == 'Invalid Symbol' or quote['lastVal'] == '0.00':
             return results
         results.append({'uri':ys.getQuoteUrl(quote['symbol']),
@@ -162,21 +168,20 @@
             try:
                 quote = self._parseLine(line.decode('utf-8'))
                 quotes.append(quote)
-            except Exception as error:
-                print(error)
+            except Exception:
+                logger.exception("Error while parsing data.")
         return quotes
 
     # this expects to be passed in a string like this:
     # HPQ+A+RHT+GM  no spaces!
     def getQuotes(self, symbols):
         url = QUOTE_URL % (symbols)
-        print(url)
         stream = urllib.request.urlopen(url)
         if stream is not None:
             if stream.getcode() is 200 or FAKE_CALL is True:
                 return self._parseData(stream)
             else:
-                print ("error: http returned %d" % (stream.getcode()))
+                logger.warning("error: http returned %d", stream.getcode())
                 stream.close()
                 return []
 
@@ -213,8 +218,8 @@
                         story["description"] = ""
                     stories.append(story)
                     count = count + 1
-                except Exception as e:
-                    print ("Exception: ", e)
+                except Exception:
+                    logger.exception("Error while getting news for: %r", symbol)
                 if count >= maxitems:
                     break
         return stories
@@ -237,8 +242,8 @@
             else:
                 # unch
                 arrow = chr(8594)
-        except Exception as e:
-            print ("Exception: ", e)
+        except Exception:
+            logger.exception("Error while getting change string.")
             return ""
         return "%s  %s (%s)" % (arrow, changeFlt, changePct)
 
@@ -253,12 +258,11 @@
                 return _("Vol: ") + str(round(fVol / 1000, 3)) + "k"
             else:
                 return _("Vol: ") + volume
-        except Exception as e:
-            print ("Exception: ", e)
+        except Exception:
+            logger.exception("Error while getting volume string.")
             return ""
 
 
-
 # Classes below this point establish communication
 # with Unity, you probably shouldn't modify them.
 
@@ -293,8 +297,8 @@
                 if not 'dnd_uri' in i or not i['dnd_uri'] or i['dnd_uri'] == '':
                     i['dnd_uri'] = i['uri']
                 result_set.add_result(**i)
-        except Exception as error:
-            print (error)
+        except Exception:
+            logger.exception("Error while building result set.")
 
 class Preview (Unity.ResultPreviewer):
 
 
=== modified file 'tests/test_yahoostock.py'
--- tests/test_yahoostock.py	2013-04-25 10:31:50 +0000
+++ tests/test_yahoostock.py	2013-09-25 19:11:08 +0000
@@ -24,7 +24,7 @@
     def perform_query(self, query, filter_set = Unity.FilterSet.new()):
         result_set = ResultSet()
         ctx = Unity.SearchContext.create(query, 0, filter_set,
-                                         None, result_set, None)
+                                         {}, result_set, None)
         s = self.scope.create_search_for_query(ctx)
         s.run()
         return result_set