Merge lp:~pieter-equinox/reahl/reahl-declarative into lp:~iv/reahl/reahl-declarative

[Pieter Nagel]

More Python 3 compatibility.

NB: This deprecates some end-user visible functionality, see individual commits. Esp relevant is ability of stubble to call replaced() for unbound methods and replace them at a class-level. Reahl does not use this, and Python 3 does not support the current implementation, so I chose to just deprecate the feature under Py2 and not support it under Py3.

[lp:~pieter-equinox/reahl/reahl-declarative]

97. By Pieter Nagel on 2014-08-19

Add test for the case where SecuredDeclaration.__get__ is used to get an unbound method

98. By Pieter Nagel on 2014-08-19

Python3 compatibility for SecuredDeclaration in bound case

99. By Pieter Nagel on 2014-08-19

SecuredDeclaration works as descriptor for getting unbound method under Python 3 too

100. By Pieter Nagel on 2014-08-19

Ignore bogus sys.setdefaultencoding under PY3. Ivan, please read comment in this commit and strongly consider ripping it out under PY2 as well

101. By Pieter Nagel on 2014-08-19

dictionary.values() is a view under python3

102. By Pieter Nagel on 2014-08-19

Fix file handle leak exposed by Python 3

103. By Pieter Nagel on 2014-08-19

Remove dead code that fails under Py3. Reahl-component now passes tests under Py3

104. By Pieter Nagel on 2014-08-19

Fix reading text out of TemporaryFiles opend in binary mode. Use open() to open files. bzrsupport now works in Python 3

105. By Pieter Nagel on 2014-08-19

Small refactoring

=== modified file 'reahl-bzrsupport/reahl/bzrsupport.py'
--- reahl-bzrsupport/reahl/bzrsupport.py	2014-08-16 06:54:45 +0000
+++ reahl-bzrsupport/reahl/bzrsupport.py	2014-08-19 13:24:49 +0000
@@ -112,49 +112,47 @@
         return None
         
     def uses_bzr(self):
-        with TemporaryFile() as err:
-            with TemporaryFile() as out:
-                try:
-                    return_code = Executable('bzr').call(['info', self.directory], stdout=out, stderr=err)
-                    return return_code == 0
-                except Exception as ex:
-                    logging.error('Error trying to execute "bzr info %s": %s' % (self.directory, ex))
-                return False
+        with open(os.devnull, 'w') as DEVNULL:
+            try:
+                return_code = Executable('bzr').call(['info', self.directory], stdout=DEVNULL, stderr=DEVNULL)
+                return return_code == 0
+            except Exception as ex:
+                logging.error('Error trying to execute "bzr info %s": %s' % (self.directory, ex))
+            return False
 
     def inventory(self):
-        with TemporaryFile() as err:
-            with TemporaryFile() as out:
+        with TemporaryFile(mode='w+') as err:
+            with TemporaryFile(mode='w+') as out:
                 bzr_args = 'inventory %s --kind=file' % self.directory
                 try:
                     return_code = Executable('bzr').call(bzr_args.split(), stdout=out, stderr=err)
                     out.seek(0)
                     err.seek(0)
                     if not err.read():
-                        files = out.read().decode().split('\n')
+                        files = out.read().split('\n')
                         return files
                 except Exception as ex:
                     logging.error('Error trying to execute "bzr %s": %s' % (bzr_args, ex))
                 return ['']
 
     def bzr_installed(self):
-        with TemporaryFile() as err:
-            with TemporaryFile() as out:
-                try:
-                    return_code = Executable('bzr').call([], stdout=out, stderr=err, shell=True)
-                    return return_code == 0
-                except OSError as ex:
-                    if ex.errno == os.errno.ENOENT:
-                        return False
-                    else:
-                        logging.error('Error trying to execute "bzr": %s' % ex)
-                except ExecutableNotInstalledException as ex:
-                    pass
-                except Exception as ex:
+        with open(os.devnull, 'w') as DEVNULL:
+            try:
+                return_code = Executable('bzr').call([], stdout=DEVNULL, stderr=DEVNULL, shell=True)
+                return return_code == 0
+            except OSError as ex:
+                if ex.errno == os.errno.ENOENT:
+                    return False
+                else:
                     logging.error('Error trying to execute "bzr": %s' % ex)
-                return False
+            except ExecutableNotInstalledException as ex:
+                pass
+            except Exception as ex:
+                logging.error('Error trying to execute "bzr": %s' % ex)
+            return False
  
     def commit(self, message, unchanged=False):
-        with file(os.devnull, 'w') as DEVNULL:
+        with open(os.devnull, 'w') as DEVNULL:
             args = '-m %s' % message
             if unchanged:
                 args += ' --unchanged'
@@ -162,20 +160,20 @@
         return return_code == 0
         
     def is_version_controlled(self):
-        with file(os.devnull, 'w') as DEVNULL:
+        with open(os.devnull, 'w') as DEVNULL:
             return_code = Executable('bzr').call('info'.split(), cwd=self.directory, stdout=DEVNULL, stderr=DEVNULL)
         return return_code == 0
 
     def is_checked_in(self):
-        with TemporaryFile() as out:
+        with TemporaryFile(mode='w+') as out:
             return_code = Executable('bzr').call('status'.split(), cwd=self.directory, stdout=out, stderr=out)
             out.seek(0)
             return return_code == 0 and not out.read()
 
     @property
     def last_commit_time(self):
-        with TemporaryFile() as out:
-            with file(os.devnull, 'w') as DEVNULL:
+        with TemporaryFile(mode='w+') as out:
+            with open(os.devnull, 'w') as DEVNULL:
                 Executable('bzr').check_call('log -r -1'.split(), cwd=self.directory, stdout=out, stderr=DEVNULL)
                 out.seek(0)
                 [timestamp] = [line for line in out if line.startswith('timestamp')]
@@ -183,13 +181,13 @@
         return datetime.datetime.strptime(timestamp, 'timestamp: %a %Y-%m-%d %H:%M:%S')
 
     def tag(self, tag_string):
-        with file(os.devnull, 'w') as DEVNULL:
+        with open(os.devnull, 'w') as DEVNULL:
             Executable('bzr').check_call(('tag %s' % tag_string).split(), cwd=self.directory, stdout=DEVNULL, stderr=DEVNULL)
         
     def get_tags(self, head_only=False):
         tags = []
-        with TemporaryFile() as out:
-            with file(os.devnull, 'w') as DEVNULL:
+        with TemporaryFile(mode='w+') as out:
+            with open(os.devnull, 'w') as DEVNULL:
                 head_only = ' -r -1 ' if head_only else ''
                 Executable('bzr').check_call(('tags'+head_only).split(), cwd=self.directory, stdout=out, stderr=DEVNULL)
                 out.seek(0)

=== modified file 'reahl-bzrsupport/reahl/bzrsupport_dev/bzrtests.py'
--- reahl-bzrsupport/reahl/bzrsupport_dev/bzrtests.py	2014-07-06 10:25:15 +0000
+++ reahl-bzrsupport/reahl/bzrsupport_dev/bzrtests.py	2014-08-19 13:24:49 +0000
@@ -33,7 +33,7 @@
     def new_bzr_directory(self, initialised=True):
         bzr_directory = temp_dir()
         if initialised:
-            with file(os.devnull, 'w') as DEVNULL:
+            with open(os.devnull, 'w') as DEVNULL:
                 Executable('bzr').check_call(['init'], cwd=bzr_directory.name, stdout=DEVNULL, stderr=DEVNULL)
         return bzr_directory
 
@@ -54,7 +54,7 @@
         bzr = Bzr(fixture.bzr_directory.name)
         vassert( bzr.is_checked_in() )
 
-        file(os.path.join(fixture.bzr_directory.name, 'afile'), 'w').close()
+        open(os.path.join(fixture.bzr_directory.name, 'afile'), 'w').close()
         vassert( not bzr.is_checked_in() )
         
     @test(BzrFixture)

=== modified file 'reahl-component/reahl/component/config.py'
--- reahl-component/reahl/component/config.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component/config.py	2014-08-19 13:24:49 +0000
@@ -19,6 +19,7 @@
 from __future__ import unicode_literals
 from __future__ import print_function
 import sys
+import six
 import os.path
 import logging
 import tempfile
@@ -256,9 +257,51 @@
         self.in_production = in_production
 
     def configure(self, validate=True):
-        #http://mail.python.org/pipermail/tutor/2005-August/040993.html
-        imp.reload(sys); #read setdefaultencoding python docs - it "enables" the method again
-        sys.setdefaultencoding('utf-8')
+        if six.PY2:
+            # NO! Doing this is WRONG. The fact that you had to hack around
+            # sys.setdefaultencoding being removed should be a clue that you
+            # are doing something bogus.
+            #
+            # The default encoding is a property of the end-user system that
+            # reahl is running on, and they are free to configure it to
+            # anything else. You just broke reahl on all systems not configured
+            # to be utf-8.
+            #
+            # The best way to think of this is to think that each and every
+            # external system around reahl that receives strings as a sequences
+            # of bytes can have its own encoding, possibly different from all
+            # others.
+            #
+            # So we have:
+            #
+            #                     HTTP
+            #                      ^
+            #                      | (utf-8, unless otherwise specified in headers etc.)
+            #                      v
+            # Command-Line <--> Reahl <-->
+            #   (stdout,
+            #    stderr)
+            #
+            # sys.setdefaultencoding is intended for the command-line, so that
+            # unicode you print to stdout etc. converts correctly to the end-user
+            # system's chosen encoding.
+            #
+            # It also governs the encoding used when you open files in text mode
+            # and read/write unicode out of or into them. If those files originate
+            # from the end-user's system they *are* most likely encoded in that
+            # system's default encoding and you should not much with that. If
+            # those files originate from some other protocol, you need to
+            # explicitly specify that protocol's encoding as per its spec.
+            #
+            # Most likely you do sys.setdefaultencoding('utf-8') so that you
+            # won't need to specify the parameter to encode() every time you
+            # send bytes to HTTP. But your code specifies the parameter to each
+            # and every encode anyway.
+            #
+
+            #http://mail.python.org/pipermail/tutor/2005-August/040993.html
+            imp.reload(sys); #read setdefaultencoding python docs - it "enables" the method again
+            sys.setdefaultencoding('utf-8')
         
         self.configure_logging()
         logging.getLogger(__name__).info('Using config in %s' % self.config_directory)
@@ -316,7 +359,8 @@
         file_path = os.path.join(self.config_directory, new_config.filename)
         if os.path.isfile(file_path):
             locals_dict = ConfigAsDict(self)
-            exec(compile(open(file_path).read(), file_path, 'exec'), globals(), locals_dict)
+            with open(file_path) as f:
+                exec(compile(f.read(), file_path, 'exec'), globals(), locals_dict)
             locals_dict.update_required(new_config.config_key)
         else:
             message = 'file "%s" not found, using defaults' % file_path

=== modified file 'reahl-component/reahl/component/eggs.py'
--- reahl-component/reahl/component/eggs.py	2014-08-19 06:30:42 +0000
+++ reahl-component/reahl/component/eggs.py	2014-08-19 13:24:49 +0000
@@ -21,7 +21,6 @@
 import os
 import os.path
 import logging
-import copy
 
 from pkg_resources import Requirement
 from pkg_resources import iter_entry_points
@@ -91,7 +90,6 @@
 
     def get_ordered_classes_exported_on(self, entry_point):
         entry_point_dict = self.distribution.get_entry_map().get(entry_point, {})
-        eps = copy.copy(entry_point_dict.values())
         found_eps = set()
         for ep in entry_point_dict.values():
             if ep in found_eps:
@@ -252,7 +250,7 @@
         for i in cls.compute_ordered_dependent_distributions(main_egg):
             entry_map = i.get_entry_map('reahl.eggs')
             if entry_map:
-                classes = entry_map.values()
+                classes = list(entry_map.values())
                 assert len(classes) == 1, 'Only one eggdeb class per egg allowed'
                 interfaces.append(classes[0].load()(i))
 

=== modified file 'reahl-component/reahl/component/i18n.py'
--- reahl-component/reahl/component/i18n.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component/i18n.py	2014-08-19 13:24:49 +0000
@@ -46,6 +46,8 @@
                     for locale_dir in package.__path__:
                         if not isinstance(translation, Translations):
                             translation = Translations.load(dirname=locale_dir, locales=[locale], domain=domain)
+                            # Babel 1.3 bug under Python 3: files is a filter object, not a list like in Python 2
+                            translation.files = list(translation.files)
                         else:
                             translation.merge(Translations.load(dirname=locale_dir, locales=[locale], domain=domain))
                 self.translations[(locale, domain)] = translation

=== modified file 'reahl-component/reahl/component/modelinterface.py'
--- reahl-component/reahl/component/modelinterface.py	2014-08-13 17:49:28 +0000
+++ reahl-component/reahl/component/modelinterface.py	2014-08-19 13:24:49 +0000
@@ -1051,7 +1051,8 @@
     
     
 class SecuredMethod(object):
-    def __init__(self, to_be_called, secured_declaration):
+    def __init__(self, instance, to_be_called, secured_declaration):
+        self.instance = instance
         self.to_be_called = to_be_called
         self.secured_declaration = secured_declaration
 
@@ -1060,21 +1061,19 @@
             raise AccessRestricted()
         return self.to_be_called(*args, **kwargs)
 
-    def check_right(self, right_to_check, called_self, *args, **kwargs):
-        args_to_send = args
-        if called_self:
-            args_to_send = [called_self]+list(args)
+    def check_right(self, right_to_check, *args, **kwargs):
         if right_to_check:
+            args_to_send = (args if self.instance is None
+                            else (self.instance,)+args)
             return right_to_check(*args_to_send, **kwargs)
         else:
             return True
 
     def read_check(self, *args, **kwargs):
-        return self.check_right(self.secured_declaration.read_check, six.get_method_self(self.to_be_called), *args, **kwargs)
+        return self.check_right(self.secured_declaration.read_check, *args, **kwargs)
     
     def write_check(self, *args, **kwargs):
-        return self.check_right(self.secured_declaration.write_check, six.get_method_self(self.to_be_called), *args, **kwargs)
-
+        return self.check_right(self.secured_declaration.write_check, *args, **kwargs)
 
 
 class SecuredDeclaration(object):
@@ -1130,8 +1129,9 @@
         return arg_spec.args[:positional_args_end]
 
     def __get__(self, instance, owner):
-        method = types.MethodType(self.func, instance, owner)
-        return SecuredMethod(method, self)
+        method = (self.func if instance is None
+                  else six.create_bound_method(self.func, instance))
+        return SecuredMethod(instance, method, self)
 
 
 secured = SecuredDeclaration #: An alias for :class:`SecuredDeclaration`

=== modified file 'reahl-component/reahl/component_dev/domainaccesscontrol.py'
--- reahl-component/reahl/component_dev/domainaccesscontrol.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component_dev/domainaccesscontrol.py	2014-08-19 13:24:49 +0000
@@ -54,7 +54,7 @@
 
         model_object = ModelObject()
         
-        # Case: access not allowed
+        # Case: access not allowed, called via bound method
         model_object.did_something = False
         with expected(AccessRestricted):
             model_object.do_something_write_only()
@@ -65,12 +65,32 @@
             model_object.do_something_read_only()
         vassert( not model_object.did_something )
 
-        # Case: access allowed
+        # Case: access not allowed, called via unbound method
+        model_object.did_something = False
+        method = ModelObject.do_something_write_only
+        with expected(AccessRestricted):
+            method(model_object)
+        vassert( not model_object.did_something )
+
+        model_object.did_something = False
+        method = ModelObject.do_something_read_only
+        with expected(AccessRestricted):
+            method(model_object)
+        vassert( not model_object.did_something )
+
+        # Case: access allowed, called via bound method
         model_object.did_something = False
         with expected(NoException):
             model_object.do_something_read_and_write()
         vassert( model_object.did_something )
 
+        # Case: access allowed, called via unbound method
+        model_object.did_something = False
+        method = ModelObject.do_something_read_and_write
+        with expected(NoException):
+            method(model_object)
+        vassert( model_object.did_something )
+
 
     @test(Fixture)
     def checks_must_match_signature(self, fixture):

=== modified file 'reahl-dev/reahl_dev.egg-info/SOURCES.txt'
--- reahl-dev/reahl_dev.egg-info/SOURCES.txt	2014-08-19 06:30:42 +0000
+++ reahl-dev/reahl_dev.egg-info/SOURCES.txt	2014-08-19 13:24:49 +0000
@@ -19,6 +19,8 @@
 reahl_dev.egg-info/SOURCES.txt
 reahl_dev.egg-info/dependency_links.txt
 reahl_dev.egg-info/entry_points.txt
+reahl_dev.egg-info/entry_points.txt.~1~
 reahl_dev.egg-info/namespace_packages.txt
 reahl_dev.egg-info/requires.txt
-reahl_dev.egg-info/top_level.txt
\ No newline at end of file
+reahl_dev.egg-info/top_level.txt
+reahl_dev.egg-info/top_level.txt.~1~
\ No newline at end of file

=== modified file 'reahl-dev/reahl_dev.egg-info/entry_points.txt'
--- reahl-dev/reahl_dev.egg-info/entry_points.txt	2014-08-17 12:45:35 +0000
+++ reahl-dev/reahl_dev.egg-info/entry_points.txt	2014-08-19 13:24:49 +0000
@@ -1,4 +1,5 @@
 [reahl.dev.xmlclasses]
+<<<<<<< TREE
 NamespaceList = reahl.dev.devdomain:NamespaceList
 DebianPackage = reahl.dev.devdomain:DebianPackage
 ScriptExport = reahl.dev.devdomain:ScriptExport
@@ -7,7 +8,19 @@
 ThirdpartyDependency = reahl.dev.devdomain:ThirdpartyDependency
 EntryPointExport = reahl.dev.devdomain:EntryPointExport
 MigrationList = reahl.dev.devdomain:MigrationList
+=======
+NamespaceList = reahl.dev.devdomain:NamespaceList
+ChickenProject = reahl.dev.devdomain:ChickenProject
+ShippedFile = reahl.dev.devdomain:ShippedFile
+TranslationPackage = reahl.dev.devdomain:TranslationPackage
+CommandAlias = reahl.dev.devdomain:CommandAlias
+XMLDependencyList = reahl.dev.devdomain:XMLDependencyList
+OrderedPersistedClass = reahl.dev.devdomain:OrderedPersistedClass
+FileList = reahl.dev.devdomain:FileList
+Project = reahl.dev.devdomain:Project
+>>>>>>> MERGE-SOURCE
 NamespaceEntry = reahl.dev.devdomain:NamespaceEntry
+<<<<<<< TREE
 FileList = reahl.dev.devdomain:FileList
 MetaInfo = reahl.dev.devdomain:MetaInfo
 DebianPackageSet = reahl.dev.devdomain:DebianPackageSet
@@ -29,13 +42,68 @@
 ShippedFile = reahl.dev.devdomain:ShippedFile
 XMLDependencyList = reahl.dev.devdomain:XMLDependencyList
 ChickenProject = reahl.dev.devdomain:ChickenProject
+=======
+EggProject = reahl.dev.devdomain:EggProject
+ProjectTag = reahl.dev.devdomain:ProjectTag
+DebianPackageSet = reahl.dev.devdomain:DebianPackageSet
+AttachmentList = reahl.dev.devdomain:AttachmentList
+MigrationList = reahl.dev.devdomain:MigrationList
+ExtraPath = reahl.dev.devdomain:ExtraPath
+ScheduledJobSpec = reahl.dev.devdomain:ScheduledJobSpec
+MetaInfo = reahl.dev.devdomain:MetaInfo
+PersistedClassesList = reahl.dev.devdomain:PersistedClassesList
+BzrSourceControl = reahl.dev.devdomain:BzrSourceControl
+ExtrasList = reahl.dev.devdomain:ExtrasList
+Dependency = reahl.dev.devdomain:Dependency
+ExcludedPackage = reahl.dev.devdomain:ExcludedPackage
+EntryPointExport = reahl.dev.devdomain:EntryPointExport
+PythonSourcePackage = reahl.dev.devdomain:PythonSourcePackage
+HardcodedMetadata = reahl.dev.devdomain:HardcodedMetadata
+PackageIndex = reahl.dev.devdomain:PackageIndex
+ScriptExport = reahl.dev.devdomain:ScriptExport
+ConfigurationSpec = reahl.dev.devdomain:ConfigurationSpec
+SshRepository = reahl.dev.devdomain:SshRepository
+DebianPackage = reahl.dev.devdomain:DebianPackage
+ThirdpartyDependency = reahl.dev.devdomain:ThirdpartyDependency
+>>>>>>> MERGE-SOURCE
 DebianPackageMetadata = reahl.dev.devdomain:DebianPackageMetadata
+<<<<<<< TREE
 ScheduledJobSpec = reahl.dev.devdomain:ScheduledJobSpec
 PythonSourcePackage = reahl.dev.devdomain:PythonSourcePackage
+=======
+
+[reahl.dev.commands]
+UpdateAptRepository = reahl.dev.devshell:UpdateAptRepository
+DebInstall = reahl.dev.devshell:DebInstall
+List = reahl.dev.devshell:List
+MarkReleased = reahl.dev.devshell:MarkReleased
+SubstVars = reahl.dev.devshell:SubstVars
+ServeSMTP = reahl.dev.mailtest:ServeSMTP
+Upload = reahl.dev.devshell:Upload
+Select = reahl.dev.devshell:Select
+ListSelections = reahl.dev.devshell:ListSelections
+ListMissingDependencies = reahl.dev.devshell:ListMissingDependencies
+ExtractMessages = reahl.dev.devshell:ExtractMessages
+ClearSelection = reahl.dev.devshell:ClearSelection
+Shell = reahl.dev.devshell:Shell
+AddLocale = reahl.dev.devshell:AddLocale
+Refresh = reahl.dev.devshell:Refresh
+CompileTranslations = reahl.dev.devshell:CompileTranslations
+Debianise = reahl.dev.devshell:Debianise
+Read = reahl.dev.devshell:Read
+DeleteSelection = reahl.dev.devshell:DeleteSelection
+MergeTranslations = reahl.dev.devshell:MergeTranslations
+Save = reahl.dev.devshell:Save
+Build = reahl.dev.devshell:Build
+Info = reahl.dev.devshell:Info
+ExplainLegend = reahl.dev.devshell:ExplainLegend
+Setup = reahl.dev.devshell:Setup
+>>>>>>> MERGE-SOURCE
 
 [console_scripts]
 reahl = reahl.dev.devshell:WorkspaceCommandline.execute_one
 
+<<<<<<< TREE
 [reahl.eggs]
 Egg = reahl.component.eggs:ReahlEgg
 
@@ -66,3 +134,8 @@
 CompileTranslations = reahl.dev.devshell:CompileTranslations
 Select = reahl.dev.devshell:Select
 
+=======
+[reahl.eggs]
+Egg = reahl.component.eggs:ReahlEgg
+
+>>>>>>> MERGE-SOURCE

=== modified file 'reahl-mailutil/reahl/mailutil/mail.py'
--- reahl-mailutil/reahl/mailutil/mail.py	2014-07-06 10:25:15 +0000
+++ reahl-mailutil/reahl/mailutil/mail.py	2014-08-19 13:24:49 +0000
@@ -22,8 +22,8 @@
 import re
 import smtplib
 import logging
-import email.MIMEMultipart
-import email.MIMEText
+from six.moves import email_mime_multipart as MIMEMultipart
+from six.moves import email_mime_text as MIMEText
 
 from reahl.component.context import ExecutionContext
 from reahl.mailutil.rst import RestructuredText
@@ -50,7 +50,7 @@
             self.to_addresses = to_addresses
             self.subject = subject
             self.rst_text = rst_message
-            self.message_root = email.MIMEMultipart.MIMEMultipart('related')
+            self.message_root = MIMEMultipart.MIMEMultipart('related')
             self.message_root['Subject'] = subject
             self.message_root['From'] = from_address
             self.message_root['To'] = ", ".join(to_addresses)
@@ -58,14 +58,14 @@
 
             # Encapsulate the plain and HTML versions of the message body in an
             # 'alternative' part, so message agents can decide which they want to display.
-            self.message_alternative = email.MIMEMultipart.MIMEMultipart('alternative')
+            self.message_alternative = MIMEMultipart.MIMEMultipart('alternative')
             self.message_root.attach(self.message_alternative)
 
-            message_text = email.MIMEText.MIMEText(rst_message.encode(charset), 'plain', charset)
+            message_text = MIMEText.MIMEText(rst_message.encode(charset), 'plain', charset)
             self.message_alternative.attach(message_text)
 
             rst = RestructuredText(rst_message)
-            message_text = email.MIMEText.MIMEText(rst.as_HTML_fragment().encode(charset), 'html', charset)
+            message_text = MIMEText.MIMEText(rst.as_HTML_fragment().encode(charset), 'html', charset)
             self.message_alternative.attach(message_text)
 
     def as_string(self):

=== modified file 'reahl-stubble/ideas/stubble.py'
--- reahl-stubble/ideas/stubble.py	2014-08-16 11:03:09 +0000
+++ reahl-stubble/ideas/stubble.py	2014-08-19 13:24:49 +0000
@@ -67,7 +67,7 @@
         stub_args = inspect.getargspec(self.stub)
         assert real_args == stub_args, 'argument specification mismatch'
 
-        return types.MethodType(self.stub, instance)
+        return six.create_bound_method(self.stub, instance)
 
     def __set__(self, instance, value):
         assert None, 'cannot set stub methods'

=== modified file 'reahl-stubble/reahl/stubble/intercept.py'
--- reahl-stubble/reahl/stubble/intercept.py	2014-08-16 11:42:52 +0000
+++ reahl-stubble/reahl/stubble/intercept.py	2014-08-19 13:24:49 +0000
@@ -17,8 +17,11 @@
 
 from __future__ import unicode_literals
 from __future__ import print_function
+import warnings
 import sys
 import io
+import six
+import inspect
 from contextlib import contextmanager
 
 from reahl.stubble.stub import StubClass
@@ -67,8 +70,8 @@
         self.kwargs = kwargs #: The dictionary with keyword arguments passed during the call
 
         
-class CallMonitor(object):
-    """The CallMonitor is a context manager which records calls to a single method of an object or class.
+class CallMonitorBase(object):
+    """The CallMonitorBase is a context manager which records calls to a single method of an object or class.
        The calls are recorded, but the original method is also executed.
 
        For example:
@@ -89,9 +92,9 @@
           assert monitor.calls[0].kwargs == {}
           assert monitor.calls[0].return_value == 'something'
     """
-    def __init__(self, method):
-        self.obj = method.__self__
-        self.method_name = method.__func__.__name__
+    def __init__(self, obj, method):
+        self.obj = obj
+        self.method_name = method.__name__
         self.calls = []  #: A list of :class:`MonitoredCalls` made, one for each call made, in the order they were made
         self.original_method = None
 
@@ -114,12 +117,18 @@
         setattr(self.obj, self.method_name, self.original_method)
 
 
-class InitMonitor(CallMonitor):
+class CallMonitor(CallMonitorBase):
+    """A :class:`CallMonitorBase` used to intercept calls to bound methods
+       of a class."""
+    def __init__(self, method):
+        super(CallMonitor, self).__init__(six.get_method_self(method), method)
+
+
+class InitMonitor(CallMonitorBase):
     """A :class:`CallMonitor` used to intercept calls to the __init__ method
        of a class."""
     def __init__(self, monitored_class):
-        super(InitMonitor, self).__init__(monitored_class.__init__)
-        self.obj = monitored_class
+        super(InitMonitor, self).__init__(monitored_class, monitored_class.__init__)
 
     @property
     def monitored_class(self):
@@ -168,8 +177,17 @@
           assert s.foo(2) == 'yyy'
     """
     StubClass.signatures_match(method, replacement, ignore_self=True)
-    target = method.im_self or method.im_class
-    method_name = method.im_func.__name__
+    if inspect.isfunction(method):
+        raise ValueError('%s should be a method' % method)
+    method_self = six.get_method_self(method)
+    if inspect.ismethod(method) and method_self is not None:
+        target = method_self
+    else:
+        warnings.warn(
+            'Stubbing by passing in unbound methods is deprecated.',
+            DeprecationWarning)
+        target = method.im_class
+    method_name = six.get_method_function(method).__name__
     saved_method = getattr(target, method_name)
     try:
         setattr(target, method_name, replacement)

=== modified file 'reahl-stubble/reahl/stubble/stub.py'
--- reahl-stubble/reahl/stubble/stub.py	2014-08-16 11:15:20 +0000
+++ reahl-stubble/reahl/stubble/stub.py	2014-08-19 13:24:49 +0000
@@ -16,16 +16,16 @@
 
 from __future__ import unicode_literals
 from __future__ import print_function
-import six
 import os
 import os.path
-import pkg_resources
 import inspect
-import types
-
 import collections
 from functools import reduce
 
+import six
+import pkg_resources
+
+
 class StubClass(object):
     def __init__(self, orig, check_attributes_also=False):
         self.orig = orig
@@ -125,7 +125,7 @@
         return os.path.join(base, *resource_name.split('/'))
 
     def _get(self, path):
-        return file(path).read()
+        return open(path).read()
 
 
 #------------------------------------------------[ Delegate ]
@@ -212,7 +212,7 @@
             if instance is None:
                 return self
             else:
-                return types.MethodType(self.value, instance)
+                return six.create_bound_method(self.value, instance)
         else:
             return self.value            
 

=== modified file 'reahl-stubble/reahl/stubble_dev/EasterEggTests.py'
--- reahl-stubble/reahl/stubble_dev/EasterEggTests.py	2014-07-06 10:25:15 +0000
+++ reahl-stubble/reahl/stubble_dev/EasterEggTests.py	2014-08-19 13:24:49 +0000
@@ -70,7 +70,7 @@
 
     @istest
     def test_resource_api(self):
-        test_file = NamedTemporaryFile()
+        test_file = NamedTemporaryFile(mode='w+')
         dirname, file_name = os.path.split(test_file.name)
 
         self.stub_egg.set_module_path(dirname)
@@ -80,7 +80,7 @@
 
         contents = 'asdd '
         test_file.write(contents)
-        test_file.seek(0)
+        test_file.flush()
 
         as_string = pkg_resources.resource_string(self.stub_egg.as_requirement(), file_name)
         assert as_string == contents

=== modified file 'reahl-stubble/reahl/stubble_dev/InterceptTests.py'
--- reahl-stubble/reahl/stubble_dev/InterceptTests.py	2014-08-14 08:49:20 +0000
+++ reahl-stubble/reahl/stubble_dev/InterceptTests.py	2014-08-19 13:24:49 +0000
@@ -18,6 +18,8 @@
 from __future__ import print_function
 
 import io
+import six
+import warnings
 from nose.tools import istest, assert_raises
 import tempfile
 
@@ -35,13 +37,13 @@
                 return y
 
         s = SomethingElse()
-        original_method = s.foo.im_func
+        original_method = six.get_method_function(s.foo)
 
         with CallMonitor(s.foo) as monitor:
             assert s.foo(1, y='a') == 'a'
             assert s.foo(2) == None
 
-        assert s.foo.im_func is original_method
+        assert six.get_method_function(s.foo) is original_method
         assert s.n == 2
         assert monitor.times_called == 2
         assert monitor.calls[0].args == (1,)
@@ -106,26 +108,65 @@
         s = SomethingElse()
         def replacement(n, y=None):
             return y
-        original_method = s.foo.im_func
+        original_method = six.get_method_function(s.foo)
 
         with replaced(s.foo, replacement):
             assert s.foo(1, y='a') == 'a'
             assert s.foo(2) == None
 
-        assert s.foo.im_func is original_method
+        assert six.get_method_function(s.foo) is original_method
 
         # Case: unbound method
+        """Python 3 does not support the concept of unbound methods, they are
+        just plain functions without an im_class pointing back to their class.
+        See https://docs.python.org/3/whatsnew/3.0.html#operators-and-special-methods,
+        and https://mail.python.org/pipermail/python-dev/2005-January/050625.html
+        for the rationale.
+
+        If stubble wishes to support them under Python 3, the signature of
+        stubble.replaced will need to change to take the class as a parameter.
+        But since reahl itself does not use this feature, we just deprecate
+        it under Python 2 and make it illegal under Python 3.
+
+        Note that we are only talking about instance methods here, not class
+        methods. Instance methods always require an instance to be called on, so
+        there should always be an instance they can be stubbed on, i.e. by using
+        replaced(instance.method, ...) instead of replaced(someclass.method, ...).
+        """
+
         s = SomethingElse()
         def replacement(self, n, y=None):
             return y
-        original_method = SomethingElse.foo.im_func
-
-        with replaced(SomethingElse.foo, replacement):
-            assert s.foo(1, y='a') == 'a'
-            assert s.foo(2) == None
-            assert SomethingElse.foo.im_func is not original_method
-
-        assert SomethingElse.foo.im_func is original_method
+        if six.PY2:
+            original_method = six.get_method_function(SomethingElse.foo)
+
+            with warnings.catch_warnings(record=True) as raised_warnings:
+                warnings.simplefilter("always")
+                with replaced(SomethingElse.foo, replacement):
+                    assert s.foo(1, y='a') == 'a'
+                    assert s.foo(2) == None
+                    assert six.get_method_function(SomethingElse.foo) is not original_method
+            assert six.get_method_function(SomethingElse.foo) is original_method
+
+            [deprecation] = raised_warnings
+            assert issubclass(deprecation.category, DeprecationWarning)
+        else:
+            with assert_raises(ValueError):
+                with replaced(SomethingElse.foo, replacement):
+                    pass
+
+    @istest
+    def test_replacing_functions_is_disallowed(self):
+        """Functions can not be replaced, only methods can."""
+
+        def function1():
+            pass
+        def function2():
+            pass
+
+        with assert_raises(ValueError):
+            with replaced(function1, function2):
+                pass
 
     @istest
     def test_replaced_signature_should_match(self):
@@ -137,16 +178,13 @@
 
 
         s = SomethingElse()
-        original_method = s.foo.im_func
 
         def replacement():
-            return y
+            pass
 
-        def with_statement():
+        with assert_raises(AssertionError):
             with replaced(s.foo, replacement):
                 pass
-        
-        assert_raises(AssertionError, with_statement)
 
     @istest
     def test_stubbed_sysout(self):

=== modified file 'reahl-tofu/reahl/tofu/files.py'
--- reahl-tofu/reahl/tofu/files.py	2014-07-28 08:03:21 +0000
+++ reahl-tofu/reahl/tofu/files.py	2014-08-19 13:24:49 +0000
@@ -18,7 +18,6 @@
 from __future__ import print_function
 import tempfile
 import os
-import io
 import sys
 import os.path
 from contextlib import contextmanager
@@ -28,20 +27,15 @@
            'temp_dir', 'added_sys_path', 'preserved_sys_modules']
 
 
-class AutomaticallyDeletedFile(io.FileIO):
+class AutomaticallyDeletedFile:
     def __init__(self, name, contents=''):
-        super(AutomaticallyDeletedFile, self).__init__(name, 'w+b')
-        self.write(contents)
-        self.seek(0)
-    def rm(self):
+        self.name = name
+        with open(name, 'w') as f:
+            f.write(contents)
+
+    def __del__(self):
         if os.path.exists(self.name):
             os.remove(self.name)
-    def __del__(self):
-        self.close()
-        try:
-            self.rm()
-        except AttributeError:
-            pass
 
 def file_with(name, contents):
     """Creates a file with the given `name` and `contents`. The file will be deleted

=== modified file 'reahl-tofu/reahl/tofu/fixture.py'
--- reahl-tofu/reahl/tofu/fixture.py	2014-08-16 11:03:09 +0000
+++ reahl-tofu/reahl/tofu/fixture.py	2014-08-19 13:24:49 +0000
@@ -17,9 +17,10 @@
 
 from __future__ import unicode_literals
 from __future__ import print_function
+import sys
+
 import six
-import sys
-import types
+
 
 #--------------------------------------------------[ MarkingDecorator ]
 class MarkingDecorator(object):
@@ -38,7 +39,7 @@
         if instance is None:
             return self
         else:
-            return types.MethodType(self.function, instance)
+            return six.create_bound_method(self.function, instance)
 
     @property
     def name(self):