Merge lp:~ceronman/txsolr/print-solrresponse-707518 into lp:txsolr

[Manuel Cerón]

This branch introduces the following changes:

 - Solr responses now can be printed without AttributeError raising.
 - txSolr logger doesn't propagate messages to higher level loggers.

[lp:~ceronman/txsolr/print-solrresponse-707518]

57. By Manuel Cerón on 2011-05-23

Added missing doscring

[Jamu Kakar (jkakar)]

[1]

+ def testSolrResponseRepr(self):
+ """A L{SolrResponse} representation shows the raw response."""
+ raw = '''{
+ "responseHeader":{
+ "status":0,
+ "QTime":2,
+ "params":{
+ "indent":"on",
+ "wt":"json",
+ "q":"manuel"}},
+ "response":{"numFound":0,"start":0,"docs":[]}
+ }'''
+ response = JSONSolrResponse(raw)
+ self.assertEqual('SolrResponse: %r' % raw, repr(response))

I think you should dump JSON here instead of constructing it by hand:

    def testSolrResponseRepr(self):
        """A L{SolrResponse} representation shows the raw response."""
        rawResponse = dumps({'responseHeader': {'status': 0,
                                                'QTime': 2,
                                                'params': {'indent': 'on',
                                                           'wt': 'json',
                                                           'q': 'manuel'}},
                             'response': {'numFound': 0,
                                          'start': 0,
                                          'docs': []}})
        response = JSONSolrResponse(rawResponse)
        self.assertEqual('SolrResponse: %r' % rawResponse, repr(response))

Nice work, +1!

review: Approve

=== modified file 'txsolr/__init__.py'
--- txsolr/__init__.py	2010-10-14 10:58:34 +0000
+++ txsolr/__init__.py	2011-05-23 23:11:37 +0000
@@ -40,6 +40,7 @@
         pass
 
 _logger = logging.getLogger('txsolr')
+_logger.propagate = False
 _logger.addHandler(_NullHandler())
 
 def logToStderr(level=logging.DEBUG):

=== modified file 'txsolr/response.py'
--- txsolr/response.py	2010-10-15 16:01:42 +0000
+++ txsolr/response.py	2011-05-23 23:11:37 +0000
@@ -127,6 +127,7 @@
         self.header = None
         self.results = None
 
+        self.rawResponse = response
         self.responseDict = self._decodeResponse(response)
         self._update()
 
@@ -169,7 +170,7 @@
             raise SolrResponseError(msg)
 
     def __repr__(self):
-        return 'SolrResponse: %s' % repr(self.rawResponse)
+        return 'SolrResponse: %r' % self.rawResponse
 
 
 class JSONSolrResponse(SolrResponse):

=== modified file 'txsolr/test/test_response.py'
--- txsolr/test/test_response.py	2010-10-14 10:58:34 +0000
+++ txsolr/test/test_response.py	2011-05-23 23:11:37 +0000
@@ -6,7 +6,6 @@
 class ResponseTest(unittest.TestCase):
 
     def test_jsonSolrResponse(self):
-
         raw = '''{
                  "responseHeader":{
                   "status":0,
@@ -52,3 +51,18 @@
                 </response> '''
 
         self.assertRaises(SolrResponseError, JSONSolrResponse, raw)
+
+    def testSolrResponseRepr(self):
+        """A L{SolrResponse} representation shows the raw response."""
+        raw = '''{
+                 "responseHeader":{
+                  "status":0,
+                  "QTime":2,
+                  "params":{
+                    "indent":"on",
+                    "wt":"json",
+                    "q":"manuel"}},
+                 "response":{"numFound":0,"start":0,"docs":[]}
+                 }'''
+        response = JSONSolrResponse(raw)
+        self.assertEqual('SolrResponse: %r' % raw, repr(response))