Merged abolish-userstring-haskey r5609:5616 to trunk.

Backwards compatible changes for easier transition to py3.0.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@5618 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

2 files changed, 3 insertions, 3 deletions

diff --git a/tools/dev/profile_docutils.py b/tools/dev/profile_docutils.py
index e342b0239..90b083787 100755
--- a/tools/dev/profile_docutils.py
+++ b/tools/dev/profile_docutils.py
@@ -34,6 +34,6 @@ stats.sort_stats('time')
 stats.print_stats(40)
 
 try:
-    execfile(os.environ['PYTHONSTARTUP'])
+    exec(open(os.environ['PYTHONSTARTUP']).read())
 except:
     pass
diff --git a/tools/dev/unicode2rstsubs.py b/tools/dev/unicode2rstsubs.py
index 9161e10c1..22ac07ecc 100755
--- a/tools/dev/unicode2rstsubs.py
+++ b/tools/dev/unicode2rstsubs.py
@@ -129,11 +129,11 @@ class CharacterEntitySetExtractor:
         set = self.entity_set_name(attributes['set'])
         if not set:
             return
-        if not self.sets.has_key(set):
+        if set not in self.sets:
             print 'bad set: %r' % set
             return
         entity = attributes['id']
-        assert (not self.sets[set].has_key(entity)
+        assert (entity not in self.sets[set]
                 or self.sets[set][entity] == self.charid), \
                 ('sets[%r][%r] == %r (!= %r)'
                  % (set, entity, self.sets[set][entity], self.charid))