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

[Pieter Nagel]

Nop

[Iwan Vosloo (iv)]

(this was a test merge request)

review: Disapprove

[Iwan Vosloo (iv)]

review: Needs Resubmitting

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

74. By Pieter Nagel on 2014-08-16

Add PyCharm project files and adapt .bzrignore to ignore user preferences

75. By Pieter Nagel on 2014-08-16

Need to decode shell output in bzrsupport for Python3

76. By Pieter Nagel on 2014-08-16

Temporary hacks to work around issues

77. By Pieter Nagel on 2014-08-16

Hold off on adding PyCharm config to project, for now

78. By Pieter Nagel on 2014-08-16

Merged

79. By Pieter Nagel on 2014-08-16

Ignore .idea again

80. By Pieter Nagel on 2014-08-16

Workaround for new.instancemethod not existing on Py3. Root problem is that MarkingDecorator tries to be both a decorator and a descriptor and does all kinds of mucking with the object model that is not needed.

81. By Pieter Nagel on 2014-08-16

Cleaner replacement for new.instancemethod in tofu and stubble

82. By Pieter Nagel on 2014-08-16

Fix one MethodType instantiation in stubble

83. By Pieter Nagel on 2014-08-16

Stubble: deahl with types/classes printing themselves differently under Py3 vs Py2

84. By Pieter Nagel on 2014-08-16

SystemOutStub: sys.stdout is open in text mode

[Pieter Nagel (pieter-equinox)]

Tofu passes all tests in Python 3. One can now just run "reahl unit" under Python 3.

Stubble is faring better but there are still 6 failures.

[Iwan Vosloo (iv)]

review: Approve

=== modified file 'reahl-bzrsupport/reahl/bzrsupport.py'
--- reahl-bzrsupport/reahl/bzrsupport.py	2014-07-06 10:25:15 +0000
+++ reahl-bzrsupport/reahl/bzrsupport.py	2014-08-16 12:12:26 +0000
@@ -130,7 +130,7 @@
                     out.seek(0)
                     err.seek(0)
                     if not err.read():
-                        files = out.read().split('\n')
+                        files = out.read().decode().split('\n')
                         return files
                 except Exception as ex:
                     logging.error('Error trying to execute "bzr %s": %s' % (bzr_args, ex))

=== modified file 'reahl-dev/reahl_dev.egg-info/SOURCES.txt'
--- reahl-dev/reahl_dev.egg-info/SOURCES.txt	2014-08-14 16:12:02 +0000
+++ reahl-dev/reahl_dev.egg-info/SOURCES.txt	2014-08-16 12:12:26 +0000
@@ -3,7 +3,6 @@
 COPYING
 LICENSE
 reahl
-setup.py
 reahl/__init__.py
 reahl/dev/__init__.py
 reahl/dev/devdomain.py

=== modified file 'reahl-dev/reahl_dev.egg-info/entry_points.txt'
--- reahl-dev/reahl_dev.egg-info/entry_points.txt	2014-08-14 16:12:02 +0000
+++ reahl-dev/reahl_dev.egg-info/entry_points.txt	2014-08-16 12:12:26 +0000
@@ -1,68 +1,68 @@
+[reahl.eggs]
+Egg = reahl.component.eggs:ReahlEgg
+
+[reahl.dev.commands]
+ListSelections = reahl.dev.devshell:ListSelections
+Shell = reahl.dev.devshell:Shell
+Select = reahl.dev.devshell:Select
+Upload = reahl.dev.devshell:Upload
+ServeSMTP = reahl.dev.mailtest:ServeSMTP
+Info = reahl.dev.devshell:Info
+AddLocale = reahl.dev.devshell:AddLocale
+DeleteSelection = reahl.dev.devshell:DeleteSelection
+Setup = reahl.dev.devshell:Setup
+Read = reahl.dev.devshell:Read
+UpdateAptRepository = reahl.dev.devshell:UpdateAptRepository
+SubstVars = reahl.dev.devshell:SubstVars
+MergeTranslations = reahl.dev.devshell:MergeTranslations
+MarkReleased = reahl.dev.devshell:MarkReleased
+CompileTranslations = reahl.dev.devshell:CompileTranslations
+Save = reahl.dev.devshell:Save
+ClearSelection = reahl.dev.devshell:ClearSelection
+DebInstall = reahl.dev.devshell:DebInstall
+ExplainLegend = reahl.dev.devshell:ExplainLegend
+ExtractMessages = reahl.dev.devshell:ExtractMessages
+ListMissingDependencies = reahl.dev.devshell:ListMissingDependencies
+List = reahl.dev.devshell:List
+Debianise = reahl.dev.devshell:Debianise
+Build = reahl.dev.devshell:Build
+Refresh = reahl.dev.devshell:Refresh
+
 [reahl.dev.xmlclasses]
-NamespaceList = reahl.dev.devdomain:NamespaceList
-DebianPackage = reahl.dev.devdomain:DebianPackage
-ScriptExport = reahl.dev.devdomain:ScriptExport
-BzrSourceControl = reahl.dev.devdomain:BzrSourceControl
-ExtraPath = reahl.dev.devdomain:ExtraPath
-ThirdpartyDependency = reahl.dev.devdomain:ThirdpartyDependency
-EntryPointExport = reahl.dev.devdomain:EntryPointExport
-MigrationList = reahl.dev.devdomain:MigrationList
+PersistedClassesList = reahl.dev.devdomain:PersistedClassesList
+ExtrasList = reahl.dev.devdomain:ExtrasList
+AttachmentList = reahl.dev.devdomain:AttachmentList
 NamespaceEntry = reahl.dev.devdomain:NamespaceEntry
+HardcodedMetadata = reahl.dev.devdomain:HardcodedMetadata
 FileList = reahl.dev.devdomain:FileList
-MetaInfo = reahl.dev.devdomain:MetaInfo
-DebianPackageSet = reahl.dev.devdomain:DebianPackageSet
-ExcludedPackage = reahl.dev.devdomain:ExcludedPackage
-OrderedPersistedClass = reahl.dev.devdomain:OrderedPersistedClass
-TranslationPackage = reahl.dev.devdomain:TranslationPackage
-PersistedClassesList = reahl.dev.devdomain:PersistedClassesList
-PackageIndex = reahl.dev.devdomain:PackageIndex
+ChickenProject = reahl.dev.devdomain:ChickenProject
+PythonSourcePackage = reahl.dev.devdomain:PythonSourcePackage
+EggProject = reahl.dev.devdomain:EggProject
 SshRepository = reahl.dev.devdomain:SshRepository
-AttachmentList = reahl.dev.devdomain:AttachmentList
 Project = reahl.dev.devdomain:Project
-Dependency = reahl.dev.devdomain:Dependency
+ScriptExport = reahl.dev.devdomain:ScriptExport
+OrderedPersistedClass = reahl.dev.devdomain:OrderedPersistedClass
+ConfigurationSpec = reahl.dev.devdomain:ConfigurationSpec
+MetaInfo = reahl.dev.devdomain:MetaInfo
 CommandAlias = reahl.dev.devdomain:CommandAlias
-ConfigurationSpec = reahl.dev.devdomain:ConfigurationSpec
-ExtrasList = reahl.dev.devdomain:ExtrasList
-EggProject = reahl.dev.devdomain:EggProject
+ShippedFile = reahl.dev.devdomain:ShippedFile
+EntryPointExport = reahl.dev.devdomain:EntryPointExport
 ProjectTag = reahl.dev.devdomain:ProjectTag
-HardcodedMetadata = reahl.dev.devdomain:HardcodedMetadata
-ShippedFile = reahl.dev.devdomain:ShippedFile
+ExtraPath = reahl.dev.devdomain:ExtraPath
+ScheduledJobSpec = reahl.dev.devdomain:ScheduledJobSpec
+DebianPackageSet = reahl.dev.devdomain:DebianPackageSet
+TranslationPackage = reahl.dev.devdomain:TranslationPackage
 XMLDependencyList = reahl.dev.devdomain:XMLDependencyList
-ChickenProject = reahl.dev.devdomain:ChickenProject
+NamespaceList = reahl.dev.devdomain:NamespaceList
+ExcludedPackage = reahl.dev.devdomain:ExcludedPackage
+BzrSourceControl = reahl.dev.devdomain:BzrSourceControl
+DebianPackage = reahl.dev.devdomain:DebianPackage
+ThirdpartyDependency = reahl.dev.devdomain:ThirdpartyDependency
+MigrationList = reahl.dev.devdomain:MigrationList
 DebianPackageMetadata = reahl.dev.devdomain:DebianPackageMetadata
-ScheduledJobSpec = reahl.dev.devdomain:ScheduledJobSpec
-PythonSourcePackage = reahl.dev.devdomain:PythonSourcePackage
+PackageIndex = reahl.dev.devdomain:PackageIndex
+Dependency = reahl.dev.devdomain:Dependency
 
 [console_scripts]
 reahl = reahl.dev.devshell:WorkspaceCommandline.execute_one
 
-[reahl.eggs]
-Egg = reahl.component.eggs:ReahlEgg
-
-[reahl.dev.commands]
-DebInstall = reahl.dev.devshell:DebInstall
-MergeTranslations = reahl.dev.devshell:MergeTranslations
-AddLocale = reahl.dev.devshell:AddLocale
-SubstVars = reahl.dev.devshell:SubstVars
-Build = reahl.dev.devshell:Build
-Save = reahl.dev.devshell:Save
-Debianise = reahl.dev.devshell:Debianise
-Shell = reahl.dev.devshell:Shell
-Read = reahl.dev.devshell:Read
-UpdateAptRepository = reahl.dev.devshell:UpdateAptRepository
-ListSelections = reahl.dev.devshell:ListSelections
-Info = reahl.dev.devshell:Info
-ClearSelection = reahl.dev.devshell:ClearSelection
-Setup = reahl.dev.devshell:Setup
-List = reahl.dev.devshell:List
-Upload = reahl.dev.devshell:Upload
-Refresh = reahl.dev.devshell:Refresh
-ExplainLegend = reahl.dev.devshell:ExplainLegend
-MarkReleased = reahl.dev.devshell:MarkReleased
-ExtractMessages = reahl.dev.devshell:ExtractMessages
-ListMissingDependencies = reahl.dev.devshell:ListMissingDependencies
-ServeSMTP = reahl.dev.mailtest:ServeSMTP
-DeleteSelection = reahl.dev.devshell:DeleteSelection
-CompileTranslations = reahl.dev.devshell:CompileTranslations
-Select = reahl.dev.devshell:Select
-

=== modified file 'reahl-stubble/ideas/stubble.py'
--- reahl-stubble/ideas/stubble.py	2014-07-05 10:41:49 +0000
+++ reahl-stubble/ideas/stubble.py	2014-08-16 12:12:26 +0000
@@ -17,7 +17,6 @@
 from __future__ import unicode_literals
 from __future__ import print_function
 import six
-import new
 import types
 import inspect
 from functools import reduce
@@ -68,7 +67,7 @@
         stub_args = inspect.getargspec(self.stub)
         assert real_args == stub_args, 'argument specification mismatch'
 
-        return new.instancemethod(self.stub, instance, owner)
+        return types.MethodType(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-14 08:49:20 +0000
+++ reahl-stubble/reahl/stubble/intercept.py	2014-08-16 12:12:26 +0000
@@ -53,7 +53,7 @@
         sys.stdout = self.original_stdout
 
     def capture_console_screenshot(self, filename):
-        with io.open(filename, 'wb') as output_file:
+        with io.open(filename, 'w') as output_file:
             output_file.write(self.captured_output)
 
 

=== modified file 'reahl-stubble/reahl/stubble/stub.py'
--- reahl-stubble/reahl/stubble/stub.py	2014-07-06 10:25:15 +0000
+++ reahl-stubble/reahl/stubble/stub.py	2014-08-16 12:12:26 +0000
@@ -21,7 +21,7 @@
 import os.path
 import pkg_resources
 import inspect
-import new
+import types
 
 import collections
 from functools import reduce
@@ -209,7 +209,10 @@
         if inspect.ismethoddescriptor(self.value) or inspect.isdatadescriptor(self.value):
             return self.value.__get__(instance, owner)
         if inspect.isfunction(self.value):
-            return new.instancemethod(self.value, instance, owner)
+            if instance is None:
+                return self
+            else:
+                return types.MethodType(self.value, instance)
         else:
             return self.value            
 

=== modified file 'reahl-stubble/reahl/stubble_dev/BasicStubRequirementsTests.py'
--- reahl-stubble/reahl/stubble_dev/BasicStubRequirementsTests.py	2014-07-06 10:25:15 +0000
+++ reahl-stubble/reahl/stubble_dev/BasicStubRequirementsTests.py	2014-08-16 12:12:26 +0000
@@ -16,9 +16,8 @@
 
 from __future__ import unicode_literals
 from __future__ import print_function
-import six
 
-from nose.tools import istest, assert_raises, assert_true, assert_equals
+from nose.tools import istest, assert_raises, assert_raises_regexp, assert_true
 
 from reahl.stubble import stubclass, exempt, EmptyStub
 
@@ -50,148 +49,123 @@
     @istest
     def test_method_attribute_mismatch(self):
         """a method in the stub which is an attribute in the stubbed is not allowed"""
-        def declare_class():
+        #normal case
+        with assert_raises_regexp(
+                AssertionError,
+                "^attribute mismatch: <class '.*\.Stub'>\.<(unbound method|function) .*Stub\.attr.*> is not compatible with the original type <(type|class) 'int'> on <class '.*Stubbed'>"):
             @stubclass(self.stubbed)
             class Stub(object):
-                def attr(self): pass
-        
-        #normal case
-        with assert_raises(AssertionError) as context:
-            declare_class()
-        assert_equals( six.text_type(context.exception), '''attribute mismatch: <class 'reahl.stubble_dev.BasicStubRequirementsTests.Stub'>.<unbound method Stub.attr> is not compatible with the original type <type 'int'> on <class 'reahl.stubble_dev.BasicStubRequirementsTests.Stubbed'>''' )
+                def attr(self):
+                    pass
 
     @istest
     def test_method_signature_mismatch(self):
         """a method signature mismatch between the stub and the stubbed is not allowed"""
-        def declare_class():
+        #normal case
+        with assert_raises_regexp(
+                AssertionError,
+                '^signature mismatch:.*Stub.method.*\(self, b, akwarg=None, \*args, \*\*kwargs\) does not match .*Stubbed.method.*\(self, a, b, akwarg=None, \*args, \*\*kwargs\)$'):
             @stubclass(self.stubbed)
             class Stub(object):
-                def method(self, b, akwarg=None, *args, **kwargs): pass
+                def method(self, b, akwarg=None, *args, **kwargs):
+                    pass
 
-        #normal case
-        with assert_raises(AssertionError) as context:
-            declare_class()
-        
-        assert_equals( six.text_type(context.exception), '''signature mismatch: <unbound method Stub.method>(self, b, akwarg=None, *args, **kwargs) does not match <unbound method Stubbed.method>(self, a, b, akwarg=None, *args, **kwargs)''' )
 
     @istest
     def test_property_method_missing_on_orig(self):
         """a property on the stub is not allowed if the stubbed class does not have property or an attribute"""
-        def declare_class():
+        #case where the property does ont exist on the stubbed class
+        with assert_raises(AssertionError):
             @stubclass(self.stubbed)
             class Stub(object):
                 @property
                 def non_existing_property(self):
                     return 2
 
-        #case where the property does ont exist on the stubbed class
-        assert_raises(AssertionError, declare_class)
-
     @istest
     def test_property_method_masks_method_on_orig(self):
         """a property on the stub is not allowed if the stubbed class has a method with the same name"""
-        def declare_class():
+        #case where the property does ont exist on the stubbed class
+        with assert_raises(AssertionError):
             @stubclass(self.stubbed)
             class Stub(object):
                 @property
                 def method(self):
                     return 2
 
-        #case where the property does ont exist on the stubbed class
-        assert_raises(AssertionError, declare_class)
-
     @istest
     def test_property_method_for_attribute_on_orig(self):
         """a property on the stub is allowed if the stubbed class has a property or an attribute of the same name"""
         #case where the stubbed class has an attribute for the property
-        def declare_class():
-            @stubclass(self.stubbed)
-            class Stub(object):
-                @property
-                def attr(self):
-                    return 2
-
-        declare_class()
+        @stubclass(self.stubbed)
+        class Stub(object):
+            @property
+            def attr(self):
+                return 2
 
         #case where the stubbed class has a matching property
-        def declare_class():
-            @stubclass(self.stubbed)
-            class Stub(object):
-                @property
-                def my_existing_property(self):
-                    return 2
-
-        declare_class()
+        @stubclass(self.stubbed)
+        class Stub(object):
+            @property
+            def my_existing_property(self):
+                return 2
 
     @istest
     def test_attribute_not_present_mismatch(self):
         """an attribute in the stub which is not in the stubbed is not allowed"""
-        def declare_class():
+        #normal case
+        with assert_raises(AssertionError):
             @stubclass(self.stubbed, True)
             class Stub(object):
                 i_am_not = 1
 
-        #normal case
-        assert_raises(AssertionError, declare_class)
-
     @istest
     def test_method_name_mismatch(self):
         """a method in the stub which has no counterpart in the stubbed is not allowed"""
-        def declare_class():
+        #normal case
+        with assert_raises(AssertionError):
             @stubclass(self.stubbed)
             class Stub(object):
-                def method1(self, a, b): pass
-
-        #normal case
-        assert_raises(AssertionError, declare_class)
+                def method1(self, a, b):
+                    pass
 
     @istest
     def test_normal_method(self):
         """a method in the stub which accurately describes one in the stubbed is allowed"""
-        def declare_class():
-            @stubclass(self.stubbed)
-            class Stub(object):
-                def method(self, a, b, akwarg=None, *args, **kwargs): pass
-
         #normal case
-        declare_class()
+        @stubclass(self.stubbed)
+        class Stub(object):
+            def method(self, a, b, akwarg=None, *args, **kwargs):
+                pass
+
 
     @istest
     def test_normal_attribute(self):
         """an attribute in the stub which is also present in the stubbed is allowed"""
 
         #normal case
-        def declare_class():
-            @stubclass(self.stubbed, True)
-            class Stub(object):
-                attr = 1
-
-        declare_class()
+        @stubclass(self.stubbed, True)
+        class Stub(object):
+            attr = 1
 
         #case where we're not checking for attributes
-        def declare_class():
-            @stubclass(self.stubbed)
-            class Stub(object):
-                i_am_not = 1
-
-        declare_class()
+        @stubclass(self.stubbed)
+        class Stub(object):
+            i_am_not = 1
 
     #----------------------------------------[ exempt members ]
     @istest
     def test_exempt_attribute(self):
         """an attribute or property marked exempt does not raise an error"""
-        def declare_class():
-            @stubclass(self.stubbed, True)
-            class Stub(object):
-                attr = 1
-                attr = exempt(attr)
-                @exempt
-                @property
-                def prop(self): pass
-            return Stub
-
+        @stubclass(self.stubbed, True)
         #normal case
-        Stub = declare_class()
+        class Stub(object):
+            attr = 1
+            attr = exempt(attr)
+            @exempt
+            @property
+            def prop(self):
+                pass
 
         # the property returns the correct value
         assert Stub().prop is None
@@ -199,59 +173,60 @@
     @istest
     def test_exempt_method(self):
         """any methods marked as exempt does not raise an error"""
-        def declare_class():
-            @stubclass(self.stubbed)
-            class Stub(object):
-                @exempt
-                def local_method(self): pass
-
-                @exempt
-                def method(): pass
-
-                @exempt
-                @classmethod
-                def local_class_method(cls): pass
-
-                @exempt
-                @classmethod
-                def a_class_method(cls): pass
-            return Stub
-
         #normal case
-        _class = declare_class()
-        _class.local_class_method()
-        _class.a_class_method()
+        @stubclass(self.stubbed)
+        class Stub(object):
+            @exempt
+            def local_method(self):
+                pass
+
+            @exempt
+            def method():
+                pass
+
+            @exempt
+            @classmethod
+            def local_class_method(cls):
+                pass
+
+            @exempt
+            @classmethod
+            def a_class_method(cls):
+                pass
+
+        Stub.local_class_method()
+        Stub.a_class_method()
 
     @istest
     def test_exempt_inherited_method(self):
         """any methods marked as exempt does not raise an error, even if they are inherited by the stub"""
-        def declare_class():
-            @stubclass(self.stubbed)
-            class Stub(object):
-                @exempt
-                def local_method(self): pass
-
-                @exempt
-                def method(): pass
-
-                @exempt
-                @classmethod
-                def local_class_method(cls): pass
-
-                @exempt
-                @classmethod
-                def a_class_method(cls): pass
-
-
-            @stubclass(self.stubbed)
-            class InheritingStub(Stub):
-                pass
-            
-            return InheritingStub
-
         #normal case
-        _class = declare_class()
-        _class.local_class_method()
-        _class.a_class_method()
+        @stubclass(self.stubbed)
+        class Stub(object):
+            @exempt
+            def local_method(self):
+                pass
+
+            @exempt
+            def method(self):
+                pass
+
+            @exempt
+            @classmethod
+            def local_class_method(cls):
+                pass
+
+            @exempt
+            @classmethod
+            def a_class_method(cls):
+                pass
+
+
+        @stubclass(self.stubbed)
+        class InheritingStub(Stub):
+            pass
+
+        InheritingStub.local_class_method()
+        InheritingStub.a_class_method()
 
 

=== modified file 'reahl-tofu/reahl/tofu/fixture.py'
--- reahl-tofu/reahl/tofu/fixture.py	2014-07-06 10:25:15 +0000
+++ reahl-tofu/reahl/tofu/fixture.py	2014-08-16 12:12:26 +0000
@@ -19,7 +19,7 @@
 from __future__ import print_function
 import six
 import sys
-import new
+import types
 
 #--------------------------------------------------[ MarkingDecorator ]
 class MarkingDecorator(object):
@@ -35,10 +35,10 @@
         
     def __get__(self, instance, owner):
         self.bind_class(owner)
-        if not instance:
+        if instance is None:
             return self
-#        return functools.wraps(self.function)(new.instancemethod(self.function, instance, owner))
-        return new.instancemethod(self.function, instance, owner)
+        else:
+            return types.MethodType(self.function, instance)
 
     @property
     def name(self):

=== modified file 'reahl-webdev/reahl/webdev/tools.py'
--- reahl-webdev/reahl/webdev/tools.py	2014-08-14 08:49:20 +0000
+++ reahl-webdev/reahl/webdev/tools.py	2014-08-16 12:12:26 +0000
@@ -20,6 +20,7 @@
 
 import six
 import io
+import time
 import contextlib
 from six.moves.urllib import parse as urllib_parse
 import logging
@@ -79,6 +80,9 @@
     def lxml_html(self):
         if self.raw_html:
             return html.fromstring(self.raw_html)
+        time.sleep(0.5) #xxxxx
+        if self.raw_html:
+            return html.fromstring(self.raw_html)
         return None