Merge lp:~ubuntu-branches/ubuntu/precise/gwibber-service-sohu/precise-201203201009 into lp:ubuntu/precise/gwibber-service-sohu

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/gwibber-service-sohu reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/gwibber-service-sohu/precise-201203201009. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

5. By Ken VanDine on 2012-03-19

releasing version 0.8.1-0ubuntu4

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-19 15:27:20 +0000
+++ debian/changelog	2012-03-20 10:15:23 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 gwibber-service-sohu (0.8.1-0ubuntu5) precise; urgency=low
 
   * debian/patches/gtk3.patch
@@ -14,6 +15,17 @@
 
  -- Ken VanDine <[e-mail]>  Mon, 19 Mar 2012 14:02:23 -0400
 
+=======
+gwibber-service-sohu (0.8.1-0ubuntu4) precise; urgency=low
+
+  * debian/patches/logger.patch
+    - Updated to use the new logger in gwibber-service (LP: #947471)
+  * debian/control
+    - require gwibber-service >= 3.3.92 for the logger changes
+
+ -- Ken VanDine <[e-mail]>  Mon, 19 Mar 2012 14:02:23 -0400
+
+>>>>>>> MERGE-SOURCE
 gwibber-service-sohu (0.8.1-0ubuntu3) precise; urgency=low
 
   * Rebuild to drop dependencies on python2.6.
 
=== added directory 'debian/patches'
=== renamed directory 'debian/patches' => 'debian/patches.moved'
=== added file 'debian/patches/logger.patch'
--- debian/patches/logger.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/logger.patch	2012-03-20 10:15:23 +0000
@@ -0,0 +1,53 @@
+=== modified file '__init__.py'
+--- old/__init__.py	2011-06-10 09:36:20 +0000
++++ new/__init__.py	2012-03-19 18:00:05 +0000
+@@ -3,10 +3,14 @@
+ import re
+ import gnomekeyring
+ from oauth import oauth
+-from gwibber.microblog.util import log, resources
++from gwibber.microblog.util import resources
++
+ from gettext import lgettext as _
+ import sohu.utils
+-log.logger.name = "Sohu"
++
++import logging
++logger = logging.getLogger("Sohu")
++logger.debug("Initializing.")
+ 
+ PROTOCOL_INFO = {
+   "name": "Sohu",
+@@ -107,7 +111,7 @@
+         m["images"] = images
+         m["type"] = "photo"
+     except: 
+-      log.logger.error("%s failure - %s", PROTOCOL_INFO["name"], data)
++      logger.error("%s failure - %s", PROTOCOL_INFO["name"], data)
+       return {}
+  
+     return m
+@@ -219,7 +223,7 @@
+     if isinstance(data, dict) and data.get("errors", 0):
+       if "authenticate" in data["errors"][0]["message"]:
+         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Authentication failed"), error["message"])
+-        log.logger.error("%s", logstr)
++        logger.error("%s", logstr)
+         return [{"error": {"type": "auth", "account": self.account, "message": data["errors"][0]["message"]}}]
+       else:
+         for error in data["errors"]:
+@@ -228,11 +232,11 @@
+     elif isinstance(data, dict) and data.get("error", 0):
+       if "Incorrect signature" in data["error"]:
+         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Request failed"), data["error"])
+-        log.logger.error("%s", logstr)
++        logger.error("%s", logstr)
+         return [{"error": {"type": "auth", "account": self.account, "message": data["error"]}}]
+     elif isinstance(data, str):
+       logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Request failed"), data)
+-      log.logger.error("%s", logstr)
++      logger.error("%s", logstr)
+       return [{"error": {"type": "request", "account": self.account, "message": data}}]
+     
+     if parse == "list":
+
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-03-20 10:15:23 +0000
@@ -0,0 +1,1 @@
+logger.patch
 
=== added directory 'debian/source'
=== renamed directory 'debian/source' => 'debian/source.moved'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-03-20 10:15:23 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)