Merge lp:~cjwatson/click-apparmor/unicode-manifest into lp:click-apparmor

[Colin Watson]

Treat manifests as UTF-8, even in non-UTF-8 locales such as those in use when running under PackageKit.

=== modified file 'apparmor/click.py'
--- apparmor/click.py	2013-09-23 23:17:28 +0000
+++ apparmor/click.py	2013-10-28 21:18:44 +0000
@@ -263,7 +263,7 @@
 
 def read_click_manifest(manifest):
     '''Read click manifest'''
-    f = open(manifest, "r")
+    f = open(manifest, "r", encoding="UTF-8")
     j = json.load(f)
     for field in required_click_fields:
         if not field in j:
@@ -274,7 +274,7 @@
 
 def read_apparmor_manifest(manifest, app):
     '''Read AppArmor manifest from click package'''
-    f = open(manifest, "r")
+    f = open(manifest, "r", encoding="UTF-8")
     j = json.load(f)
     if (len(j.keys()) == 1) and app in j:
         j = j[app]

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-28 21:12:25 +0000
+++ debian/changelog	2013-10-28 21:18:44 +0000
@@ -1,3 +1,9 @@
+click-apparmor (0.1.12) UNRELEASED; urgency=low
+
+  * Treat manifests as UTF-8, even in non-UTF-8 locales (LP: #1245677).
+
+ -- Colin Watson <[e-mail]>  Mon, 28 Oct 2013 14:14:23 -0700
+
 click-apparmor (0.1.11) saucy; urgency=low
 
   * don't traceback on os.remove (LP: #1234908)

=== modified file 'test-clicktool.py'
--- test-clicktool.py	2013-09-04 22:48:25 +0000
+++ test-clicktool.py	2013-10-28 21:18:44 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python3
+# -*- coding: UTF-8 -*-
 
 # ------------------------------------------------------------------
 #
@@ -11,7 +12,7 @@
 # ------------------------------------------------------------------
 
 # not needed for python3, but pyflakes is grumpy without it
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 from apparmor import click
 from apparmor.click import AppName
@@ -43,15 +44,16 @@
         j['version'] = version
         j['hooks'] = dict()
         j['title'] = "Some silly demo app called %s" % (name)
-        j['maintainer'] = 'Buggy McJerkerson <[e-mail]>'
+        j['maintainer'] = 'Büggy McJerkerson <[e-mail]>'
         return j
 
     def _add_app_to_json(self, app):
         j = self.manifest_json
         j['hooks'][app] = dict()
         j['hooks'][app]['apparmor'] = "apparmor/%s.json" % (app)
-        with open(self.click_manifest, "w") as f:
-            json.dump(j, f, indent=2, separators=(',', ': '), sort_keys=True)
+        with open(self.click_manifest, "w", encoding="UTF-8") as f:
+            json.dump(j, f, indent=2, separators=(',', ': '), sort_keys=True,
+                      ensure_ascii=False)
 
     def add_package(self, name, version, framework=None):
         self.package = name
@@ -65,9 +67,9 @@
             self.manifest_json['framework'] = framework
         self.click_manifest = os.path.join(self.click_pkgdir, "%s.manifest" %
                                            (name))
-        with open(self.click_manifest, "w+") as f:
+        with open(self.click_manifest, "w+", encoding="UTF-8") as f:
             json.dump(self.manifest_json, f, indent=2, separators=(',', ': '),
-                      sort_keys=True)
+                      sort_keys=True, ensure_ascii=False)
 
     def add_app(self, appname, manifest=None):
         os.mkdir(os.path.join(self.click_pkgdir, "apparmor"))
@@ -75,7 +77,7 @@
                                (appname))
         self._add_app_to_json(appname)
 
-        with open(aa_json, "w+") as f:
+        with open(aa_json, "w+", encoding="UTF-8") as f:
             if manifest:
                 f.write(manifest)
         os.symlink(aa_json, os.path.join(self.click_dir,
@@ -260,11 +262,12 @@
         j['version'] = "0.1"
         j['hooks'] = dict()
         j['title'] = "Some silly demo app"
-        j['maintainer'] = 'Buggy McJerkerson <[e-mail]>'
+        j['maintainer'] = 'Büggy McJerkerson <[e-mail]>'
 
         self.click_manifest = os.path.join(self.tmpdir, "test-app.manifest")
-        with open(self.click_manifest, "w+") as f:
-            json.dump(j, f, indent=2, separators=(',', ': '), sort_keys=True)
+        with open(self.click_manifest, "w+", encoding="UTF-8") as f:
+            json.dump(j, f, indent=2, separators=(',', ': '), sort_keys=True,
+                      ensure_ascii=False)
         try:
             apparmor.click.read_click_manifest(self.click_manifest)
         except click.AppArmorException: