Merge lp:~jtaylor/ubuntu/quantal/update-notifier/lp-1040380 into lp:ubuntu/quantal/update-notifier

[Julian Taylor]

python3 removed dict.has_key and python-debian has followed suit and removed it too

[Dimitri John Ledkov (xnox)]

Apparently we use lp:~ubuntu-core-dev/update-notifier/ubuntu which is stated in the debian/control ( I am guessing it predates lp:ubuntu/$package branches).

But no worries, I have cherry picked your change there, and will release soon.

Thanks a lot for your contribution. It should unbreak:
* upgrading to 12.10
* installing 12.10 with a CD
* using 12.10!!!

review: Approve

[Dimitri John Ledkov (xnox)]

https://launchpad.net/ubuntu/+source/update-notifier/0.121ubuntu1

=== modified file 'data/hooks.py'
--- data/hooks.py	2011-10-13 09:27:26 +0000
+++ data/hooks.py	2012-08-25 13:35:21 +0000
@@ -50,7 +50,7 @@
             for line in open(hooks_seen):
                 filename, mtime, cmd_run = string.split(line)
                 if os.path.exists(self.hookDir+filename) and \
-                   not self._hooks.has_key(filename):
+                   filename not in self._hooks:
                     h = self.HookFile(filename)
                     h.mtime = mtime
                     h.cmd_run = cmd_run
@@ -63,7 +63,7 @@
     def _update(self):
         """ update hook dict with the current state on the fs """
         for hook in dircache.listdir(self.hookDir):
-            if self._hooks.has_key(hook):
+            if hook in self._hooks:
                 # we have it already, check if it was motified since
                 # we last saw it
                 h = self._hooks[hook]

=== modified file 'data/package-data-downloader'
--- data/package-data-downloader	2012-05-15 16:16:08 +0000
+++ data/package-data-downloader	2012-08-25 13:35:21 +0000
@@ -209,13 +209,13 @@
 		files = []
 		sums = []
 		for para in hook.iter_paragraphs(open(file)):
-			if para.has_key('script'):
+			if 'script' in para:
 				if not files:
 					record_failure(relfile)
 					break
 				command = [para['script']]
 
-				if para.has_key('should-download'):
+				if 'should-download' in para:
 					db = debconf.DebconfCommunicator('update-notifier')
 					try:
 						should = db.get(para['should-download'])

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-15 16:20:43 +0000
+++ debian/changelog	2012-08-25 13:35:21 +0000
@@ -1,3 +1,9 @@
+update-notifier (0.119ubuntu11) UNRELEASED; urgency=low
+
+  * replace dict.has_key with key in dict (LP: #1040380)
+
+ -- Julian Taylor <[e-mail]>  Sat, 25 Aug 2012 15:30:11 +0200
+
 update-notifier (0.119ubuntu10) quantal; urgency=low
 
   * Merge in changes from 0.119ubuntu8.1 which had been uploaded to