From 283d668be374c7ac64ab690a50d63db55f2e09b2 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Thu, 16 Jan 2014 17:07:56 +0000
Subject: [PATCH] Make portable to python 3.3.

Copied from Perforce
 Change: 184032
 ServerID: perforce.ravenbrook.com
---
 mps/manual/source/extensions/mps/__init__.py | 6 +++---
 mps/manual/source/extensions/mps/designs.py  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mps/manual/source/extensions/mps/__init__.py b/mps/manual/source/extensions/mps/__init__.py
index d729c1a2e5d..b5797dc0796 100644
--- a/mps/manual/source/extensions/mps/__init__.py
+++ b/mps/manual/source/extensions/mps/__init__.py
@@ -6,7 +6,7 @@ See <http://sphinx-doc.org/extensions.html>
 from collections import defaultdict
 from inspect import isabstract, isclass
 import re
-import designs
+from . import designs
 
 from docutils import nodes, transforms
 from sphinx import addnodes
@@ -295,7 +295,7 @@ class GlossaryTransform(transforms.Transform):
             ('e', 'ed'),
             ('', 'ed'),
             ])
-        for (name, fullname), value in objects.items():
+        for (name, fullname), value in list(objects.items()):
             if name != 'term':
                 continue
             m = self.sense_re.match(fullname)
@@ -338,6 +338,6 @@ def setup(app):
     app.add_role_to_domain('mps', 'ref', mps_ref_role)
     app.add_transform(GlossaryTransform)
     app.connect('build-finished', GlossaryTransform.warn_indirect_terms)
-    for g in globals().itervalues():
+    for g in globals().values():
         if isclass(g) and issubclass(g, MpsDirective):
             g.add_to_app(app)
diff --git a/mps/manual/source/extensions/mps/designs.py b/mps/manual/source/extensions/mps/designs.py
index 22f9e481c67..a6d102d34f7 100644
--- a/mps/manual/source/extensions/mps/designs.py
+++ b/mps/manual/source/extensions/mps/designs.py
@@ -91,7 +91,7 @@ def index_sub(m):
     return s
 
 def convert_file(name, source, dest):
-    s = open(source).read()
+    s = open(source, encoding='utf-8').read()
     # We want the index directive to go right at the start, so that it leads
     # to the whole document.
     m = index.search(s)
@@ -115,7 +115,7 @@ def convert_file(name, source, dest):
         os.makedirs(os.path.dirname(dest))
     except:
         pass
-    with open(dest, 'w') as out:
+    with open(dest, mode='w', encoding='utf-8') as out:
         out.write(s)
 
 # Mini-make