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

[Pieter Nagel]

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

106. By Pieter Nagel on 2014-08-30

Merged

107. By Pieter Nagel on 2014-08-30

Fix some temporary files that were opened in binary mode for writing text to. Tried to document the issue by making the file open mode a parameter, defaulting to text mode

108. By Pieter Nagel on 2014-08-30

Add __future__ imports for absolute_import, division, and ensure all py files have them

109. By Pieter Nagel on 2014-08-30

Fix broken ambiguous imports revealed by enabling absolute_import

110. By Pieter Nagel on 2014-08-30

Standardize all multiline future imports into a sngle one-liner

111. By Pieter Nagel on 2014-08-30

from __future__ import with_statement not needed since Python 2.6, reahl is on Python 2.7

112. By Pieter Nagel on 2014-08-30

Fix bogus import of exceptions module that no longer exists in Py3

113. By Pieter Nagel on 2014-08-30

Fix DeclarativeMeta/ABCMeta hackery at the root (hackery anyway didn't work under Py3)

114. By Pieter Nagel on 2014-08-30

Fix another case of text files opened in binary mode

115. By Pieter Nagel on 2014-08-30

Fix import that needed to go through six.moves

116. By Pieter Nagel on 2014-08-30

Python 2 identifiers are limited to pure ASCII, Python 3 are a larger subset of Unicode

117. By Pieter Nagel on 2014-08-31

Ensure arg_checks applies to the actual callable that checkargs() is going to check

118. By Pieter Nagel on 2014-08-31

No longer redundantly specify __init__ to checkargs

119. By Pieter Nagel on 2014-08-31

checkargs no longer magically adds 'self' for you, the sender has to specify NotYetAvailalbe('self') whenever relevant

120. By Pieter Nagel on 2014-08-31

Clean up checkargs() a bit (overbroad try/except scope, etc)

121. By Pieter Nagel on 2014-08-31

Silence test noise under Py3 about cgi.escape deprecation

122. By Pieter Nagel on 2014-08-31

Try to reduce the misconception that UTF-8 is magic compatibility sauce for *all* context where bytes-as-text is used (it only applies where protocol specifies it receives UTF-8)

123. By Pieter Nagel on 2014-08-31

WebOb does not want bytes for header values under Python 3. Also, UTF-8 encoding the headers showed conceptual misunderstaning

124. By Pieter Nagel on 2014-09-04

merged

125. By Pieter Nagel on 2014-09-04

Adapt test to fact that classes str themselves differently under Py3

126. By Pieter Nagel on 2014-09-04

Fix nondeterministic sort order

127. By Pieter Nagel on 2014-09-04

Leave comment on UploadedFile about file-like object issues, fixing it now seems a bit of a tangent

128. By Pieter Nagel on 2014-09-04

Adapt tests to fact that uploaded files are bytes

129. By Pieter Nagel on 2014-09-04

For some strange reason MultiDict sometimes returns empty string and sometimes empty bytes?

130. By Pieter Nagel on 2014-09-04

keys() in Py3 is a view

131. By Pieter Nagel on 2014-09-04

Baby step: small refactorings

132. By Pieter Nagel on 2014-09-04

Baby step: fix confysion between content encoding and charset

133. By Pieter Nagel on 2014-09-04

WSGI spec does want iterator over bytes in Py3 as well. Adapt test accordingly

134. By Pieter Nagel on 2014-09-04

Fix: ViewableFile intended encoding to mean encoding, not charset.

135. By Pieter Nagel on 2014-09-04

Change API of FileFromBlob to rather take contents in the form of unicode/str (Py2) or str/bytes (Py3)

136. By Pieter Nagel on 2014-09-04

Remove the mucking with setdefaultencoding

137. By Pieter Nagel on 2014-09-04

Reduce more UTF-8 magic constants

138. By Pieter Nagel on 2014-09-04

Reduce more UTF-8 magic constants

139. By Pieter Nagel on 2014-09-04

Remove more utf-8 magic contants

140. By Pieter Nagel on 2014-09-04

Less utf-8 magic constants

=== modified file '.bzrignore'
--- .bzrignore	2014-07-17 08:49:33 +0000
+++ .bzrignore	2014-09-04 15:41:33 +0000
@@ -5,6 +5,7 @@
 debian/*.debhelper
 debian/*.substvars
 debian/files
+__pycache__
 *.old
 build
 _build
@@ -28,7 +29,7 @@
 debian/python-reahl-domain/
 debian/python-reahl-domainui/
 debian/python-reahl-web/
-debian/python-reahl-web-elixirimpl/
+debian/python-reahl-web-declarative/
 debian/*.debhelper.log
 reahl-component/reahl_component.egg-info/
 reahl-doc/reahl_doc.egg-info/
@@ -42,7 +43,7 @@
 reahl-stubble/reahl_stubble.egg-info/
 reahl-tofu/reahl_tofu.egg-info/
 reahl-web/reahl_web.egg-info/
-reahl-web-elixirimpl/reahl_web_elixirimpl.egg-info/
+reahl-web-declarative/reahl_web_webdeclarative.egg-info/
 reahl-webdev/reahl_webdev.egg-info/
 
 reahl.egg-info/

=== modified file '.reahlproject'
--- .reahlproject	2014-08-16 07:15:07 +0000
+++ .reahlproject	2014-09-04 15:41:33 +0000
@@ -33,10 +33,18 @@
     <egg name="reahl-postgresqlsupport"/>
   </extras>  
 
+  <extras name="declarative">
+    <egg name="reahl-sqlalchemysupport"/>
+    <egg name="reahl-web-declarative"/>
+    <egg name="reahl-domain"/>
+    <egg name="reahl-domainui"/>
+  </extras>  
+
   <extras name="elixir">
-    <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-domain"/>
-    <egg name="reahl-domainui"/>
+    <egg name="reahl-sqlalchemysupport" version="2.1"/>
+    <egg name="reahl-domain" version="2.1"/>
+    <egg name="reahl-domainui" version="2.1"/>
+    <egg name="reahl-web-elixirimpl" version="2.1"/>
     <egg name="reahl-web-elixirimpl"/>
   </extras>  
 

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2013-12-08 19:02:48 +0000
+++ MANIFEST.in	2014-09-04 15:41:33 +0000
@@ -13,4 +13,4 @@
 prune reahl-tofu
 prune reahl-web
 prune reahl-webdev
-prune reahl-web-elixirimpl
+prune reahl-web-declarative

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-24 12:09:36 +0000
+++ debian/changelog	2014-09-04 15:41:33 +0000
@@ -1,11 +1,28 @@
-python-reahl (2.1.2) unstable; urgency=low
-
- * Implements https://blueprints.launchpad.net/reahl/+spec/phased-migration.
- * Implements https://blueprints.launchpad.net/reahl/+spec/datatable.
- * Closes bugs: #1326745, #1335641, #1336039, #1336042, #1356992, #1345577, #1345579.
-
- -- Iwan Vosloo <[e-mail]>  Sun, 24 Aug 2014 13:50:00 +0200
-
+<<<<<<< TREE
+python-reahl (2.1.2) unstable; urgency=low
+
+ * Implements https://blueprints.launchpad.net/reahl/+spec/phased-migration.
+ * Implements https://blueprints.launchpad.net/reahl/+spec/datatable.
+ * Closes bugs: #1326745, #1335641, #1336039, #1336042, #1356992, #1345577, #1345579.
+
+ -- Iwan Vosloo <[e-mail]>  Sun, 24 Aug 2014 13:50:00 +0200
+
+=======
+python-reahl (3.0) unstable; urgency=low
+
+ * xxx.
+
+ -- Iwan Vosloo <[e-mail]>  Sun, 24 Aug 2014 13:50:00 +0200
+
+python-reahl (2.1.2) unstable; urgency=low
+
+ * Implements https://blueprints.launchpad.net/reahl/+spec/phased-migration.
+ * Implements https://blueprints.launchpad.net/reahl/+spec/datatable.
+ * Closes bugs: #1326745, #1335641, #1336039, #1336042, #1356992, #1345577, #1345579.
+
+ -- Iwan Vosloo <[e-mail]>  Sun, 24 Aug 2014 13:50:00 +0200
+
+>>>>>>> MERGE-SOURCE
 python-reahl (2.1.1) unstable; urgency=low
 
  * Closes small bugs: #1322652, #1322833, #1322855, #1324018, #1324040.

=== modified file 'debian/control'
--- debian/control	2014-08-19 06:23:54 +0000
+++ debian/control	2014-09-04 15:41:33 +0000
@@ -24,7 +24,11 @@
  This package does not contain much itself, but is an entry point for installing
  a set of Reahl eggs:
  .
+<<<<<<< TREE
  Install Reahl by installing with extras, eg: easy_install "reahl[elixir,sqlite,dev,doc]"
+=======
+ Install Reahl by installing with extras, eg: easy_install "reahl[declarative,sqlite,dev,doc]"
+>>>>>>> MERGE-SOURCE
  to install everything needed to run Reahl on sqlite, the dev tools and documentation.
  .
  See http://www.reahl.org/docs/current/tutorial/gettingstarted.d.html for 
@@ -253,7 +257,7 @@
  See http://www.reahl.org/docs/current/tutorial/gettingstarted.d.html for 
  installation instructions.
 
-Package: python-reahl-web-elixirimpl
+Package: python-reahl-web-declarative
 Architecture: all
 Depends: ${python:Depends}, ${reahl:Depends}
 Provides: ${python:Provides}

=== modified file 'reahl-bzrsupport/reahl/__init__.py'
--- reahl-bzrsupport/reahl/__init__.py	2014-07-06 10:25:15 +0000
+++ reahl-bzrsupport/reahl/__init__.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2008, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 # -*- mode: python; mode: font-lock -*-
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 __import__('pkg_resources').declare_namespace(__name__)
 

=== 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-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 import subprocess
 import logging
@@ -112,18 +111,17 @@
         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)
@@ -137,24 +135,23 @@
                 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 +159,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 +180,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-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 """Tests for the bzrsupport module."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 import os
 import os.path
@@ -33,7 +32,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 +53,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/.reahlproject'
--- reahl-component/.reahlproject	2014-07-04 08:35:49 +0000
+++ reahl-component/.reahlproject	2014-09-04 15:41:33 +0000
@@ -8,8 +8,8 @@
 
   <deps purpose="run">
     <thirdpartyegg name="six"/> 
-    <thirdpartyegg name="Babel" minversion="0.9" maxversion="0.10"/> 
-    <thirdpartyegg name="python-dateutil" minversion="1.5" maxversion="1.6"/> 
+    <thirdpartyegg name="Babel" minversion="1.3" maxversion="1.3.9999"/> 
+    <thirdpartyegg name="python-dateutil" minversion="2.2" maxversion="2.2.999"/> 
     <thirdpartyegg name="decorator" minversion="3.4" maxversion="3.4"/> 
   </deps>
 

=== modified file 'reahl-component/etc/reahl.config.py'
--- reahl-component/etc/reahl.config.py	2014-07-06 10:25:15 +0000
+++ reahl-component/etc/reahl.config.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,12 +15,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.sqlalchemysupport import SqlAlchemyControl
 
 reahlsystem.root_egg = 'reahl-component'
-#reahlsystem.connection_uri = 'postgres://rhug:rhug@localhost/rhug'
+#reahlsystem.connection_uri = 'postgresql://rhug:rhug@localhost/rhug'
 reahlsystem.connection_uri = 'sqlite:///:memory:'
 
 reahlsystem.orm_control = SqlAlchemyControl(echo=False)

=== modified file 'reahl-component/reahl/__init__.py'
--- reahl-component/reahl/__init__.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/__init__.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2007, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 # -*- mode: python; mode: font-lock -*-
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 __import__('pkg_resources').declare_namespace(__name__)
 

=== modified file 'reahl-component/reahl/component/__init__.py'
--- reahl-component/reahl/component/__init__.py	2014-07-05 10:41:49 +0000
+++ reahl-component/reahl/component/__init__.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,6 @@
 
 """This package consists of the component framework used by Reahl Components.
 
-from __future__ import unicode_literals
-from __future__ import print_function
-import six
 It includes all component-related functionality needed in a production environment.
 """
+from __future__ import print_function, unicode_literals, absolute_import, division

=== 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-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2008-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,9 +16,9 @@
 
 """The Reahl configuration utilities."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import sys
+import six
 import os.path
 import logging
 import tempfile
@@ -256,10 +256,6 @@
         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')
-        
         self.configure_logging()
         logging.getLogger(__name__).info('Using config in %s' % self.config_directory)
         sys.path.insert(0,self.config_directory)
@@ -316,7 +312,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/context.py'
--- reahl-component/reahl/component/context.py	2014-07-24 08:26:45 +0000
+++ reahl-component/reahl/component/context.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2008-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 """The Reahl context utilities."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import inspect
 
 

=== modified file 'reahl-component/reahl/component/dbutils.py'
--- reahl-component/reahl/component/dbutils.py	2014-08-21 11:55:07 +0000
+++ reahl-component/reahl/component/dbutils.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2008-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 """Utilities to manipulate underlying databases - sometimes via an ORM tool."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import re
 from contextlib import contextmanager
 import logging
@@ -159,6 +158,7 @@
             raise InvalidConnectionURIException()
         return match.groupdict()
 
+
 class NullDatabaseControl(DatabaseControl):
     uri_regex_string = r''
     @classmethod
@@ -175,17 +175,21 @@
         
 
 class ORMControl(object):
-    is_elixir = False
-
     def migrate_db(self, eggs_in_order):
         with self.managed_transaction():
-            migration_run = MigrationRun(self, eggs_in_order)
-            migration_run.schedule_migrations()
-            migration_run.execute_migrations()
-
-
-
-
+<<<<<<< TREE
+            migration_run = MigrationRun(self, eggs_in_order)
+            migration_run.schedule_migrations()
+            migration_run.execute_migrations()
+
+
+
+
+=======
+            migration_run = MigrationRun(self, eggs_in_order)
+            migration_run.schedule_migrations()
+            migration_run.execute_migrations()
+>>>>>>> MERGE-SOURCE
 
 
 

=== modified file 'reahl-component/reahl/component/decorators.py'
--- reahl-component/reahl/component/decorators.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component/decorators.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -41,8 +41,7 @@
 # THE SOFTWARE.
 
  
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 from functools import partial, wraps
 import inspect

=== modified file 'reahl-component/reahl/component/eggs.py'
--- reahl-component/reahl/component/eggs.py	2014-08-19 06:23:54 +0000
+++ reahl-component/reahl/component/eggs.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2007-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 """Classes that aid in dealing with Eggs and setting them up."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import os
 import os.path
 import logging
@@ -90,6 +89,11 @@
 
     def get_ordered_classes_exported_on(self, entry_point):
         entry_point_dict = self.distribution.get_entry_map().get(entry_point, {})
+        found_eps = set()
+        for ep in entry_point_dict.values():
+            if ep in found_eps:
+                raise AssertionError('%s is listed twice' % ep)
+            found_eps.add(ep)
         return [entry.load() for order, entry in sorted([(int(order), e) for order, e in entry_point_dict.items()])]
 
     def get_classes_exported_on(self, entry_point):
@@ -148,7 +152,7 @@
 
             if resource_isdir(requirement, egg_internal_path):
                 languages = [d for d in resource_listdir(requirement, egg_internal_path)
-                             if resource_isdir(requirement, '%s/%s' % (egg_internal_path, d))]
+                             if (resource_isdir(requirement, '%s/%s' % (egg_internal_path, d)) and not d.startswith('__'))]
             else:
                 logging.error('Translations of %s not found in %s' % (requirement, egg_internal_path))
                 languages = []
@@ -244,7 +248,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/exceptions.py'
--- reahl-component/reahl/component/exceptions.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component/exceptions.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 """Exceptions used throughout several Reahl components."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import six
 import inspect
 import sys
@@ -40,9 +39,10 @@
     def __init__(self, commit=False):
         self.commit = commit
 
-    __hash__ = None
-    def __eq__(self, other):
-        return isinstance(other, self.__class__) and self.commit == other.commit
+#    __hash__ = None
+#    def __eq__(self, other):
+#        import pdb; pdb.set_trace()
+#        return isinstance(other, self.__class__) and self.commit == other.commit
     
     def __reduce__(self):
         return (self.__class__, (self.commit,))
@@ -151,6 +151,7 @@
     def __str__(self):
         return '%s: %s should be %s or subclass of it (got %s instead)' % (self.func, self.arg_name, self.type_.value, self.value)
 
+
 class IsCallable(ArgumentCheck):
     def __init__(self, args=(), kwargs={}, allow_none=False):
         super(IsCallable, self).__init__(allow_none=allow_none)
@@ -179,29 +180,25 @@
     def __str__(self):
         return '%s: %s should be a callable object (got %s)' % (self.func, self.arg_name, self.value)
 
-def checkargs(method, *args, **kwargs):
-    arg_checks = getattr(method, 'arg_checks', {})
+def checkargs(target, *args, **kwargs):
+    if inspect.ismethod(target) or inspect.isfunction(target):
+        to_check = target
+    elif inspect.isclass(target):
+        to_check = target.__init__
+    elif isinstance(target, collections.Callable):
+        to_check = target.__call__
+    else:
+        raise ProgrammerError('%s was expected to be a callable object' % target)
+
     try:
-        if inspect.ismethod(method) or inspect.isfunction(method):
-            to_check = method
-        elif inspect.isclass(method):
-            to_check = method.__init__
-        elif isinstance(method, collections.Callable):
-            to_check = method.__call__
-        else:
-            raise ProgrammerError('%s was expected to be a callable object' % method)
-
-        if inspect.ismethod(to_check) and not to_check.__self__:
-            call_args = (NotYetAvailable('self'),)+args
-        else:
-            call_args = args
-        bound_args = inspect.getcallargs(to_check, *call_args, **kwargs)
+        bound_args = inspect.getcallargs(to_check, *args, **kwargs)
     except TypeError as ex:
-        ex.args = (('%s: ' % method)+ex.args[0],) + ex.args[1:]
+        ex.args = (('%s: ' % target)+ex.args[0],) + ex.args[1:]
         raise
-    for arg_name, arg_check in arg_checks.items():
+    args_to_check = getattr(to_check, 'arg_checks', {})
+    for arg_name, arg_check in args_to_check.items():
         if arg_name in bound_args.keys():
-            arg_check.check(method, arg_name, bound_args[arg_name])
+            arg_check.check(target, arg_name, bound_args[arg_name])
 
 def checkargs_explained(explanation, method, *args, **kwargs):
     try:

=== 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-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009, 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -14,8 +14,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import gettext
 import threading
 
@@ -46,6 +45,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/migration.py'
--- reahl-component/reahl/component/migration.py	2014-08-24 12:09:36 +0000
+++ reahl-component/reahl/component/migration.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,13 +16,18 @@
 
 """Support for database schema migration."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from pkg_resources import parse_version
-import logging
+<<<<<<< TREE
+import logging
+=======
+import logging
+import warnings
+>>>>>>> MERGE-SOURCE
 
 from reahl.component.exceptions import ProgrammerError
 
+<<<<<<< TREE
 
 class MigrationRun(object):
     def __init__(self, orm_control, eggs_in_order):
@@ -83,6 +88,75 @@
             self.execute(phase)
 
 
+=======
+
+class MigrationRun(object):
+    def __init__(self, orm_control, eggs_in_order):
+        self.orm_control = orm_control
+        self.changes = MigrationSchedule('drop_fk', 'drop_pk', 'pre_alter', 'alter', 
+                                         'create_pk', 'indexes', 'data', 'create_fk', 'cleanup')
+        self.eggs_in_order = eggs_in_order
+
+    def migrations_to_run_for(self, egg):
+        return [migration(self.changes) 
+                for migration in egg.compute_migrations(self.orm_control.schema_version_for(egg, default='0.0'))]
+
+    def schedule_migrations(self):
+        migrations_per_egg = [(egg, self.migrations_to_run_for(egg))
+                              for egg in self.eggs_in_order]
+
+        self.schedule_migration_changes(reversed(migrations_per_egg), 'upgrade')
+        self.schedule_migration_changes(migrations_per_egg, 'upgrade_cleanup')
+        self.schedule_migration_changes(migrations_per_egg, 'schedule_upgrades')
+
+    def schedule_migration_changes(self, migrations_per_egg, method_name):
+        for egg, migration_list in migrations_per_egg:
+            current_schema_version = self.orm_control.schema_version_for(egg, default='0.0')
+            message = 'Scheduling %s %s migrations for %s - from version %s to %s' % \
+                          (len(migration_list), method_name, egg.name, 
+                           current_schema_version, egg.version)
+            logging.getLogger(__name__).info(message)
+            for migration in migration_list:
+                if (method_name in ['upgrade', 'upgrade_cleanup']) and hasattr(migration, method_name):
+                    message = 'Please override Migration.schedule_upgrades() instead.'
+                    warnings.warn('DEPRECATED: %s.%s. %s' % (migration.__class__.__name__, method_name, message), DeprecationWarning, stacklevel=-1)
+                if hasattr(migration, method_name):
+                    getattr(migration, method_name)()
+
+    def execute_migrations(self):
+        self.changes.execute_all()
+        self.update_schema_versions()
+        
+    def update_schema_versions(self):
+        for egg in self.eggs_in_order:
+            if self.orm_control.schema_version_for(egg, default='0.0') != egg.version:
+                logging.getLogger(__name__).info('Migrating %s - updating schema version to %s' % (egg.name, egg.version))
+                self.orm_control.update_schema_version_for(egg)
+
+
+class MigrationSchedule(object):
+    def __init__(self, *phases):
+        self.phases_in_order = phases
+        self.phases = dict([(i, []) for i in phases])
+
+    def schedule(self, phase, to_call, *args, **kwargs):
+        try:
+            self.phases[phase].append((to_call, args, kwargs))
+        except KeyError as e:
+            raise ProgrammerError('A phase with name<%s> does not exist.' % phase)
+
+    def execute(self, phase):
+        logging.getLogger(__name__).info('Executing schema change phase %s' % phase)
+        for to_call, args, kwargs in self.phases[phase]:
+            logging.getLogger(__name__).debug(' change: %s(%s, %s)' % (to_call.__name__, args, kwargs))
+            to_call(*args, **kwargs)
+
+    def execute_all(self):
+        for phase in self.phases_in_order:
+            self.execute(phase)
+
+
+>>>>>>> MERGE-SOURCE
 class Migration(object):
     """Represents one logical change that can be made to an existing database schema.
     
@@ -101,6 +175,7 @@
         return parse_version(cls.version) > parse_version(current_schema_version) and \
                parse_version(cls.version) <= parse_version(new_version)
 
+<<<<<<< TREE
     def __init__(self, changes):
         self.changes = changes
 
@@ -141,6 +216,37 @@
            for execution in phases. Rather use :meth:`reahl.component.migration.Migration.schedule_upgrades`.
            (See :meth:`reahl.component.migration.Migration.schedule`).
         """
+=======
+    def __init__(self, changes):
+        self.changes = changes
+
+    def schedule(self, phase, to_call, *args, **kwargs):
+        """Call this method to schedule a method call for execution later during the specified migration phase.
+
+           Scheduled migrations are first collected from all components, then the calls scheduled for each defined
+           phase are executed. Calls in one phase are executed in the order they were scheduled. Phases are executed
+           in the following order:
+
+           'drop_fk', 'drop_pk', 'pre_alter', 'alter', 'create_pk', 'indexes', 'data', 'create_fk', 'cleanup'
+
+           :param phase: The name of the phase to schedule this call.
+           :param to_call: The method or function to call.
+           :param args: The positional arguments to be passed in the call.
+           :param kwargs: The keyword arguments to be passed in the call.
+        """
+        self.changes.schedule(phase, to_call, *args, **kwargs)
+
+    def schedule_upgrades(self):
+        """Override this method in a subclass in order to supply custom logic for changing the database schema. This
+           method will be called for each of the applicable Migrations listed for all components, in order of 
+           dependency of components (the component deepest down in the dependency tree, first).
+
+           **Added in 2.1.2**: Supply custom upgrade logic by calling `self.schedule()`.
+        """
+        warnings.warn('Ignoring %s.schedule_upgrades(): it does not override schedule_upgrades() (method name typo perhaps?)' % self.__class__.__name__ , 
+                      UserWarning, stacklevel=-1)
+
+>>>>>>> MERGE-SOURCE
 
 
 

=== modified file 'reahl-component/reahl/component/modelinterface.py'
--- reahl-component/reahl/component/modelinterface.py	2014-08-12 12:38:44 +0000
+++ reahl-component/reahl/component/modelinterface.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 """Facilities to govern user input and output, as well as what access the current user has to model objects."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import six
 import copy
 import re
@@ -1051,7 +1050,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 +1060,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 +1128,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`
@@ -1142,7 +1141,7 @@
     def __init__(self):
         account = ExecutionContext.get_context().session.account
         if account:
-            party = account.party
+            party = account.owner
         else:
             party = None
         super(CurrentUser, self).__init__(required=True, default=party)
@@ -1293,7 +1292,7 @@
     def parse_input(self, unparsed_input):
         try:
             return dateutil.parser.parse(unparsed_input, dayfirst=True, parserinfo=self.parser_info).date()
-        except ValueError:
+        except (ValueError, TypeError):  # For TypeError, see https://bugs.launchpad.net/dateutil/+bug/1247643
             raise InputParseException()
 
     def unparse_input(self, parsed_value):
@@ -1462,7 +1461,23 @@
 
 
 class UploadedFile(object):
-    """Represents a file that was input by a user."""
+    """Represents a file that was input by a user.
+
+    FIXME: This would work better if it just took the bytes of the file as
+    parameter, and computed size from that, instead of taking a file-like object.
+    Any idea that using a file is more optimal is a fiction, because we seek
+    the file to the end which forces the whole file to be buffered in memory
+    anyway.
+
+    The contents of the file should be represented as bytes, because knowing what
+    the encoding is is a tricky issue. The user only sits in front of the browser
+    and selects files on their filesystem and hits 'upload'. Those files can be
+    binary or text. If text, they may or may not be in the same encoding as their
+    system's preferred encoding. If binary, their browser may guess their content
+    type correctly or may not, and if we go and decode them with i.e UTF-8, the
+    system could break with UnicodeDecodeError on jpegs and the like.
+    """
+
     def __init__(self, filename, file_obj, content_type, size):
         self.file_obj = file_obj
         self.filename = filename

=== modified file 'reahl-component/reahl/component/prodshell.py'
--- reahl-component/reahl/component/prodshell.py	2014-08-14 17:42:07 +0000
+++ reahl-component/reahl/component/prodshell.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 """The Reahl production commandline utility."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 
 from pkg_resources import DistributionNotFound

=== modified file 'reahl-component/reahl/component/py3compat.py'
--- reahl-component/reahl/component/py3compat.py	2014-07-06 13:28:05 +0000
+++ reahl-component/reahl/component/py3compat.py	2014-09-04 15:41:33 +0000
@@ -1,7 +1,24 @@
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 import six
 
-def old_str(something):
-    if six.PY2:
-        return something.encode('utf-8')
-    return something
+
+def ascii_as_bytes_or_str(unicode_str):
+    if six.PY2:
+        return unicode_str.encode('ascii')
+    else:
+        return unicode_str
+
+
+def _html_escape_function():
+    if six.PY2:
+        import cgi
+        def html_escape(s, quote=True):
+            return cgi.escape(s, quote=quote)
+        return html_escape
+    else:
+        import html
+        return html.escape
+
+
+html_escape = _html_escape_function()

=== modified file 'reahl-component/reahl/component/shelltools.py'
--- reahl-component/reahl/component/shelltools.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component/shelltools.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009, 2011, 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 """A basic framework for writing commandline utilities."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import sys
 import os.path
 import logging

=== modified file 'reahl-component/reahl/component_dev/argumentchecks.py'
--- reahl-component/reahl/component_dev/argumentchecks.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component_dev/argumentchecks.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import six
 from nose.tools import istest
 from reahl.tofu import Fixture

=== modified file 'reahl-component/reahl/component_dev/attachmenttests.py'
--- reahl-component/reahl/component_dev/attachmenttests.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component_dev/attachmenttests.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from nose.tools import istest
 from reahl.tofu import  test, Fixture, vassert
 from reahl.stubble import easter_egg

=== modified file 'reahl-component/reahl/component_dev/componenttests.py'
--- reahl-component/reahl/component_dev/componenttests.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component_dev/componenttests.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2011, 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 from nose.tools import istest
 from reahl.tofu import  test, Fixture
@@ -38,7 +37,7 @@
         # All eggs for a root egg can be found in dependency order
         components_in_order = ReahlEgg.compute_ordered_dependent_distributions(easter_egg.as_requirement_string())
         component_names_in_order = [i.project_name for i in components_in_order]
-        vassert( component_names_in_order == [easter_egg.project_name, 'reahl-component', 'decorator', 'python-dateutil', 'Babel', 'six'] )
+        vassert( component_names_in_order == [easter_egg.project_name, 'reahl-component', 'decorator', 'python-dateutil', 'six', 'Babel', 'pytz'] )
 
     @test(Fixture)
     def interface_with_meta_info(self, fixture):

=== modified file 'reahl-component/reahl/component_dev/configtests.py'
--- reahl-component/reahl/component_dev/configtests.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component_dev/configtests.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2008-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import six
 import pkg_resources
 import re

=== modified file 'reahl-component/reahl/component_dev/contexttests.py'
--- reahl-component/reahl/component_dev/contexttests.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component_dev/contexttests.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2011, 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from nose.tools import istest
 from reahl.tofu import  test, Fixture
 from reahl.tofu import vassert

=== 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-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from nose.tools import istest
 from reahl.tofu import  Fixture, test, scenario
 from reahl.tofu import expected, NoException, vassert
@@ -54,7 +53,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 +64,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-component/reahl/component_dev/fieldtests.py'
--- reahl-component/reahl/component_dev/fieldtests.py	2014-08-13 17:10:16 +0000
+++ reahl-component/reahl/component_dev/fieldtests.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 # -*- encoding: utf-8 -*-
 #
 #    This file is part of Reahl.
@@ -16,8 +16,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import six
 import datetime
 import functools

=== modified file 'reahl-component/reahl/component_dev/fixtures.py'
--- reahl-component/reahl/component_dev/fixtures.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component_dev/fixtures.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.tofu import Fixture
 
 from reahl.component.context import ExecutionContext

=== modified file 'reahl-component/reahl/component_dev/i18ntests.py'
--- reahl-component/reahl/component_dev/i18ntests.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/component_dev/i18ntests.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -14,8 +14,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from threading import Timer
 import datetime
 

=== modified file 'reahl-component/reahl/component_dev/migrationtests.py'
--- reahl-component/reahl/component_dev/migrationtests.py	2014-08-24 12:09:36 +0000
+++ reahl-component/reahl/component_dev/migrationtests.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,18 +15,34 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+<<<<<<< TREE
 from __future__ import unicode_literals
 from __future__ import print_function
 
 import six
+=======
+from __future__ import print_function, unicode_literals, absolute_import, division
+
+import six
+>>>>>>> MERGE-SOURCE
 from contextlib import contextmanager
-
-from reahl.tofu import Fixture, test, vassert, expected, NoException
-from reahl.stubble import CallMonitor, EmptyStub
-
+<<<<<<< TREE
+
+from reahl.tofu import Fixture, test, vassert, expected, NoException
+from reahl.stubble import CallMonitor, EmptyStub
+
+=======
+import warnings
+import re
+
+from reahl.tofu import Fixture, test, vassert, expected, NoException
+from reahl.stubble import CallMonitor, EmptyStub
+
+>>>>>>> MERGE-SOURCE
 
 from reahl.component.dbutils import ORMControl
 from reahl.component.eggs import ReahlEgg
+<<<<<<< TREE
 from reahl.component.migration import Migration, MigrationSchedule, MigrationRun
 from reahl.component.exceptions import ProgrammerError
 
@@ -37,6 +53,19 @@
 # All the migrations are scheduled, then run for all the migrations to bring things up to each intermediate version.
 
 
+=======
+from reahl.component.migration import Migration, MigrationSchedule, MigrationRun
+from reahl.component.exceptions import ProgrammerError
+
+class stubclass(object):
+    def __init__(self, cls):
+        pass
+    def __call__(self, cls):
+        warnings.warn('This needs to become stubble.stubclass, but stubble does not deal with this scenario - it needs to be fixed')
+        return cls
+
+@stubclass(ReahlEgg)
+>>>>>>> MERGE-SOURCE
 class ReahlEggStub(ReahlEgg):
     def __init__(self, name, version, migrations):
         super(ReahlEggStub, self).__init__(None)
@@ -55,18 +84,32 @@
     def migrations_in_order(self):
         return self.migrations
 
-
+<<<<<<< TREE
+
+=======
+
+@stubclass(ORMControl)
+>>>>>>> MERGE-SOURCE
 class ORMControlStub(ORMControl):
-    created_schema_for = None
+<<<<<<< TREE
+    created_schema_for = None
+=======
+    created_schema_for = None
+
+>>>>>>> MERGE-SOURCE
     def __init__(self):
         self.versions = {}
+
     @contextmanager
     def managed_transaction(self):
         yield
+
     def update_schema_version_for(self, egg):
         self.versions[egg.name] = egg.version
-    def schema_version_for(self, egg):
+
+    def schema_version_for(self, egg, default=None):
         return self.versions[egg.name]
+
     def initialise_schema_version_for(self, egg):
         self.versions[egg.name] = egg.version
     def set_currently_installed_version_for(self, egg, version_number):
@@ -74,12 +117,17 @@
     def create_db_tables(self, transaction, new_eggs):
         self.created_schema_for = new_eggs
 
+    def set_currently_installed_version_for(self, egg, version_number):
+        self.versions[egg.name] = version_number
+
+
 
 class MigrateFixture(Fixture):
     def new_orm_control(self):
         return ORMControlStub()
 
 
+<<<<<<< TREE
 @test(MigrateFixture)
 def how_migration_works(fixture):
     """Calls that will modify the database are scheduled in the schedule_upgrades() method of all
@@ -244,6 +292,188 @@
     migration_run = MigrationRun(fixture.orm_control, [egg])
     migration_run.execute_migrations()
     vassert( fixture.orm_control.schema_version_for(egg) == '2.0' )
+=======
+@test(MigrateFixture)
+def how_migration_works(fixture):
+    """Calls that will modify the database are scheduled in the schedule_upgrades() method of all
+       the applicable Migrations for a single migration run. `shedule_upgrades()` is called on each
+       migration in order of their versions. Once all calls are scheduled,
+       they are executed as scheduled.
+    """
+
+    class SomeObject(object):
+        calls_made = []
+        def do_something(self, arg):
+            self.calls_made.append(arg)
+    some_object = SomeObject()
+    
+    class Migration1(Migration):
+        version = '2.0'
+        def schedule_upgrades(self):
+            self.schedule('drop_fk', some_object.do_something, 'drop_fk_1')
+            self.schedule('data', some_object.do_something, 'data_1')
+            self.schedule('drop_fk', some_object.do_something, 'drop_fk_2')
+
+    class Migration2(Migration):
+        version = '3.0'
+        def schedule_upgrades(self):
+            self.schedule('drop_fk', some_object.do_something, 'drop_fk_3')
+
+    egg = ReahlEggStub('my_egg', '4.0', [Migration1, Migration2])
+    fixture.orm_control.set_currently_installed_version_for(egg, '1.0')
+
+    fixture.orm_control.migrate_db([egg])
+
+    expected_order = ['drop_fk_1', 'drop_fk_2', 'drop_fk_3', 'data_1']
+    vassert( some_object.calls_made == expected_order )
+
+
+@test(MigrateFixture)
+def schedule_executes_in_order(fixture):
+    """A MigrationSchedule is used internally to schedule calls in different phases. The calls 
+       scheduled in each phase are executed in the order the phases have been set up on the MigrationSchedule.
+       Within a phase, the calls are executed in the order they were registered in that phase.
+    """
+    
+    schedule_names = ['a', 'b', 'c']
+    migration_schedule = MigrationSchedule(*schedule_names)
+
+    class SomeObject(object):
+        def do_something(self, arg):
+            pass
+    some_object = SomeObject()
+
+    #schedule calls not in registered order
+    with CallMonitor(some_object.do_something) as monitor:
+        migration_schedule.schedule('c', some_object.do_something, 'c1')
+        migration_schedule.schedule('a', some_object.do_something, 'a1')
+        migration_schedule.schedule('b', some_object.do_something, 'b')
+        migration_schedule.schedule('a', some_object.do_something, 'a2')
+        migration_schedule.schedule('c', some_object.do_something, 'c2')
+
+    migration_schedule.execute_all()
+
+    actual_order = [call.args[0] for call in monitor.calls]
+    expected_order = ['a1', 'a2', 'b', 'c1', 'c2']
+    vassert( actual_order == expected_order )
+
+
+@test(MigrateFixture)
+def schedule_executes_phases_with_parameters(fixture):
+    """When a MigrationSchedule executes the calls that were scheduled from a Migration, 
+       the methods are actually called, and passed the correct arguments."""
+
+    class SomeObject(object):
+        def please_call_me(self, arg, kwarg=None):
+            pass
+    some_object = SomeObject()
+    
+    migration_schedule = MigrationSchedule('phase_name')
+    migration = Migration(migration_schedule)
+
+    with CallMonitor(some_object.please_call_me) as monitor:
+        migration.schedule('phase_name', some_object.please_call_me, 'myarg', kwarg='mykwarg')
+
+    migration_schedule.execute_all()
+
+    vassert( monitor.calls[0].args == ('myarg',) )
+    vassert( monitor.calls[0].kwargs == dict(kwarg='mykwarg') )
+
+
+@test(MigrateFixture)
+def invalid_schedule_name_raises(fixture):
+    """A useful error is raised when an attempt is made to schedule a call in a phase that is not defined."""
+    
+    valid_schedule_names = ['a', 'b']
+    migration_schedule = MigrationSchedule(*valid_schedule_names)
+
+    def check_exception(ex):
+        vassert( six.text_type(ex) == 'A phase with name<wrong_name> does not exist.' )
+
+    with expected(ProgrammerError, test=check_exception):
+        migration_schedule.schedule('wrong_name', None)
+
+
+@test(MigrateFixture)
+def version_dictates_execution_of_migration_(fixture):
+    """Each Migration should have a class attribute `version` that states which version of the component
+       it upgrades the database schema to. Only the Migrations with versions greater than the current 
+       schema version are included in a MigrationRun for a given egg.
+    """
+    
+    class PreviousVersionMigration(Migration):
+        version = '1.0'
+    class MatchingCurrentVersionMigration(Migration):
+        version = '2.0'
+    class NewerVersionMigration(Migration):
+        version = '3.0'
+    class EvenNewerVersionMigration(Migration):
+        version = '4.0'
+
+    egg = ReahlEggStub('my_egg', '4.0', [PreviousVersionMigration, MatchingCurrentVersionMigration, 
+                                         NewerVersionMigration, EvenNewerVersionMigration])
+    fixture.orm_control.set_currently_installed_version_for(egg, '2.0')
+
+    migration_run = MigrationRun(fixture.orm_control, [egg])
+    migrations_to_run = migration_run.migrations_to_run_for(egg)
+    classes_to_run = [m.__class__ for m in migrations_to_run]
+    vassert( classes_to_run == [NewerVersionMigration, EvenNewerVersionMigration] )
+
+
+@test(MigrateFixture)
+def version_of_migration_not_set_error(fixture):
+    """If the version to which a Migration is applicable is not set, an error is raised."""
+    class TestMigration(Migration):
+        pass
+
+    egg = ReahlEggStub('my_egg', '1.0', [TestMigration])
+    fixture.orm_control.set_currently_installed_version_for(egg, '0.0')
+
+    def check_exception(ex):
+        vassert( re.match('Migration <class \'reahl\.component_dev\.migrationtests\..*TestMigration\'> does not have a version set', six.text_type(ex) ))
+
+    with expected(ProgrammerError, test=check_exception):
+        fixture.orm_control.migrate_db([egg])
+
+
+@test(MigrateFixture)
+def missing_schedule_upgrades_warns(fixture):
+    """If a programmer does not override schedule_upgrades, a warning is raised."""
+    class TestMigration(Migration):
+        pass
+
+    with warnings.catch_warnings(record=True) as raised_warnings:
+         warnings.simplefilter("always")
+  
+         TestMigration(EmptyStub()).schedule_upgrades()
+ 
+    [warning] = raised_warnings
+    expected_message = 'Ignoring TestMigration.schedule_upgrades(): it does not override schedule_upgrades() (method name typo perhaps?)'
+    vassert( six.text_type(warning.message) == expected_message  )
+
+
+@test(MigrateFixture)
+def available_migration_phases(fixture):
+    """These are the phases, and order of the phases in a MigrationRun."""
+
+    migration_run = MigrationRun(fixture.orm_control, [])
+    
+    expected_order = ('drop_fk', 'drop_pk', 'pre_alter', 'alter', 'create_pk', 'indexes', 'data', 'create_fk', 'cleanup')
+    vassert( migration_run.changes.phases_in_order == expected_order  )
+
+
+@test(MigrateFixture)
+def schema_version_housekeeping(fixture):
+    """The database keeps track of the schema for each installed component. After a migration run
+       the currently installed versions are updated.
+    """
+    
+    egg = ReahlEggStub('my_egg', '2.0', [])
+    fixture.orm_control.set_currently_installed_version_for(egg, '1.0')
+    migration_run = MigrationRun(fixture.orm_control, [egg])
+    migration_run.execute_migrations()
+    vassert( fixture.orm_control.schema_version_for(egg) == '2.0' )
+>>>>>>> MERGE-SOURCE
 
 
 

=== modified file 'reahl-component/reahl/messages/__init__.py'
--- reahl-component/reahl/messages/__init__.py	2014-07-06 10:25:15 +0000
+++ reahl-component/reahl/messages/__init__.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,7 +16,6 @@
 
 # -*- mode: python; mode: font-lock -*-
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 __import__('pkg_resources').declare_namespace(__name__)
 

=== modified file 'reahl-component/reahl/messages/af/LC_MESSAGES/reahl-component.po'
--- reahl-component/reahl/messages/af/LC_MESSAGES/reahl-component.po	2014-08-23 17:45:01 +0000
+++ reahl-component/reahl/messages/af/LC_MESSAGES/reahl-component.po	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights
 # reserved.
 #
 # Afrikaans translations for reahl-component.
@@ -6,7 +6,11 @@
 msgstr ""
 "Project-Id-Version: reahl-component 2.0.0a1\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2014-08-23 19:27+0200\n"
+=======
+"POT-Creation-Date: 2014-08-23 19:48+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2012-04-13 08:38+0200\n"
 "Last-Translator: Iwan Vosloo <[e-mail]>\n"
 "Language-Team: af <[e-mail]>\n"
@@ -14,9 +18,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 
+<<<<<<< TREE
 #: reahl/component/config.py:137
+=======
+#: reahl/component/config.py:138
+>>>>>>> MERGE-SOURCE
 msgid "MISSING!!"
 msgstr "NIE GESPESIFISEER!!"
 

=== modified file 'reahl-component/reahl/messages/reahl-component'
--- reahl-component/reahl/messages/reahl-component	2014-08-23 17:45:01 +0000
+++ reahl-component/reahl/messages/reahl-component	2014-09-04 15:41:33 +0000
@@ -7,18 +7,30 @@
 #, fuzzy
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: reahl-component 2.1.1\n"
+=======
+"Project-Id-Version: reahl-component 3.0\n"
+>>>>>>> MERGE-SOURCE
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2014-08-23 19:27+0200\n"
+=======
+"POT-Creation-Date: 2014-08-23 19:48+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 
+<<<<<<< TREE
 #: reahl/component/config.py:137
+=======
+#: reahl/component/config.py:138
+>>>>>>> MERGE-SOURCE
 msgid "MISSING!!"
 msgstr ""
 

=== modified file 'reahl-dev/.reahlproject'
--- reahl-dev/.reahlproject	2014-03-04 07:34:43 +0000
+++ reahl-dev/.reahlproject	2014-09-04 15:41:33 +0000
@@ -7,7 +7,7 @@
     <egg name="reahl-component"/>
     <egg name="reahl-tofu"/> 
     <egg name="reahl-bzrsupport"/> 
-    <thirdpartyegg name="Babel" minversion="0.9" maxversion="0.10"/> 
+    <thirdpartyegg name="Babel" minversion="1.3" maxversion="1.3.9999"/> 
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-dev/reahl/__init__.py'
--- reahl-dev/reahl/__init__.py	2014-07-06 10:25:15 +0000
+++ reahl-dev/reahl/__init__.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2008, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,7 +16,6 @@
 
 # -*- mode: python; mode: font-lock -*-
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 __import__('pkg_resources').declare_namespace(__name__)
 

=== modified file 'reahl-dev/reahl/dev/__init__.py'
--- reahl-dev/reahl/dev/__init__.py	2014-07-05 10:41:49 +0000
+++ reahl-dev/reahl/dev/__init__.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,6 @@
 
 """Tools used during development on Reahl projects.
 
-from __future__ import unicode_literals
-from __future__ import print_function
-import six
 These tools are not deployed in a production environment, only in a development environment.
 """
+from __future__ import print_function, unicode_literals, absolute_import, division

=== modified file 'reahl-dev/reahl/dev/devdomain.py'
--- reahl-dev/reahl/dev/devdomain.py	2014-07-26 08:39:42 +0000
+++ reahl-dev/reahl/dev/devdomain.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,10 +15,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """This module houses the main classes used to understand and manipulate Reahl projects in development."""
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import six
 import os
+import io
 import sys
 import glob
 import re
@@ -43,7 +43,7 @@
 from reahl.dev.xmlreader import XMLReader, TagNotRegisteredException
 from reahl.component.exceptions import ProgrammerError
 from reahl.component.eggs import ReahlEgg
-from reahl.component.py3compat import old_str
+from reahl.component.py3compat import ascii_as_bytes_or_str
 
 from reahl.dev.exceptions import NoException, StatusException, AlreadyUploadedException, NotBuiltException, NotAValidProjectException, \
     InvalidProjectFileException, NotUploadedException, NotVersionedException, NotCheckedInException, \
@@ -199,7 +199,7 @@
         return os.path.join('debian', 'python-%s.install' % self.egg_project.project_name)
 
     def generate(self):
-        with open(self.filename, 'w') as out_file:
+        with io.open(self.filename, 'w') as out_file:
             out_file.write(os.path.join('debian', self.package_set.deb_base_name, self.egg_project.project_name, 'usr'))
             out_file.write('  /\n') 
 
@@ -248,12 +248,12 @@
         self.uploaded_project_ids = set()
         if not os.path.exists(self.upload_state_filename):
             return
-        f = open(self.upload_state_filename, 'r')
+        f = io.open(self.upload_state_filename, 'r')
         self.uploaded_project_ids = set(f.read().splitlines())
         f.close()
 
     def write(self):
-        f = open(self.upload_state_filename, 'w')
+        f = io.open(self.upload_state_filename, 'w')
         f.writelines(['%s\n' % i for i in self.uploaded_project_ids])
         f.close()
 
@@ -394,11 +394,11 @@
         
 class LocalAptRepository(LocalRepository):
     def build_index_files(self):
-        with open( os.path.join(self.root_directory, 'Packages'), 'w' ) as packages_file:
+        with io.open( os.path.join(self.root_directory, 'Packages'), 'w' ) as packages_file:
             Executable('apt-ftparchive').check_call(['packages', '.'], cwd=self.root_directory, stdout=packages_file)
 
         path_name, directory_name = os.path.split(self.root_directory)
-        with open( os.path.join(self.root_directory, 'Release'), 'w' ) as release_file:
+        with io.open( os.path.join(self.root_directory, 'Release'), 'w' ) as release_file:
             Executable('apt-ftparchive').check_call(['release', directory_name], cwd=path_name, stdout=release_file)
 
         Executable('gpg').check_call(['-abs', '--yes', '-o', 'Release.gpg', 'Release'], cwd=self.root_directory)
@@ -523,7 +523,7 @@
         self.name = name
         self.ignore_version = ignore_version
         self.version = Version(version) if version else None
-
+        
     @classmethod
     def get_xml_registration_info(cls):
         return ('egg', cls, None)
@@ -1135,7 +1135,7 @@
         self.filename = filename
 
     def parse_heading_for(self, element):
-        with open(self.filename) as changelog_file:
+        with io.open(self.filename) as changelog_file:
             for line in changelog_file:
                 if line.strip():
                     match = re.match(self.heading_regex, line)
@@ -1159,7 +1159,7 @@
     def stanzas(self):
         stanzas = []
         current_stanza = ''
-        with open(self.filename) as control_file:
+        with io.open(self.filename) as control_file:
             for line in control_file:
                 if not line.strip():
                     if current_stanza:
@@ -1292,7 +1292,7 @@
         project_filename = os.path.join(directory, '.reahlproject')
         if not os.path.isfile(project_filename):
             raise NotAValidProjectException(project_filename)
-        input_file = open(project_filename, 'r')
+        input_file = io.open(project_filename, 'r')
         try:
             reader = XMLReader()
             project = reader.read_file(input_file, (workspace, directory))
@@ -1611,7 +1611,7 @@
         sources = []
         sources_filename = os.path.join(self.egg_info_directory, 'SOURCES.txt')
 
-        with open(sources_filename) as in_file:
+        with io.open(sources_filename) as in_file:
             for line in in_file:
                 sources.append(line)
         return sources
@@ -1651,7 +1651,7 @@
                      extras_require=self.extras_require_for_setup() )
 
     def generate_setup_py(self):
-        with open(os.path.join(self.directory, 'setup.py'), 'w') as setup_file:
+        with io.open(os.path.join(self.directory, 'setup.py'), 'w') as setup_file:
             setup_file.write('from setuptools import setup\n')
             setup_file.write('setup(\n')
             setup_file.write('    name=%s,\n' % repr(self.project_name))
@@ -1701,13 +1701,13 @@
         return find_packages(where=self.directory, exclude=exclusions)
 
     def namespace_packages_for_setup(self):
-        return [old_str(i.name) for i in self.namespaces]  # Note: this has to return non-six.text_type strings for setuptools!
+        return [ascii_as_bytes_or_str(i.name) for i in self.namespaces]  # Note: this has to return non-six.text_type strings for setuptools!
 
     def py_modules_for_setup(self):
         return list(set(['setup']+[i[1] for i in pkgutil.iter_modules('.') if not i[2]]))
 
     def package_data_for_setup(self):
-        return {old_str(''): [old_str('*/LC_MESSAGES/*.mo')]}
+        return {ascii_as_bytes_or_str(''): [ascii_as_bytes_or_str('*/LC_MESSAGES/*.mo')]}
 
     @property
     def test_suite(self):
@@ -1871,7 +1871,7 @@
         return directories
 
     def read(self, filename):
-        f = open(filename, 'r')
+        f = io.open(filename, 'r')
         dirnames = f.read().splitlines()
         f.close()
         for name in dirnames:
@@ -1932,7 +1932,7 @@
                         dirs[:] = []  # This prunes the tree so it does not walk deeper in here
 
     def save(self, filename):
-        f = open(filename, 'w')
+        f = io.open(filename, 'w')
         f.writelines(['%s\n' % i.relative_directory for i in self])
         f.close()
 
@@ -1943,7 +1943,7 @@
         self[:] = []
         if not os.path.isfile(filename):
             return
-        with open(filename, 'r') as f:
+        with io.open(filename, 'r') as f:
             project_dirs = f.read().splitlines()
         for name in project_dirs:
             full_dir = os.path.join(self.workspace.directory, name)
@@ -2108,7 +2108,7 @@
         if not os.path.isfile(self.filename):
             return
 
-        with open(self.filename) as f:
+        with io.open(self.filename) as f:
             for line in f:
                 bits = line.strip().split('=')
                 key = bits[0]
@@ -2116,7 +2116,7 @@
                 self[key] = value
 
     def write(self):
-        with open(self.filename, 'w') as f:
+        with io.open(self.filename, 'w') as f:
             for key, value in self:
                 f.write('%s=%s\n' % (key, value))
 

=== modified file 'reahl-dev/reahl/dev/devshell.py'
--- reahl-dev/reahl/dev/devshell.py	2014-07-06 10:25:15 +0000
+++ reahl-dev/reahl/dev/devshell.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,10 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """The module contains code to implement commands that can be issued from a commandline to manipulate Reahl projects."""
-from __future__ import unicode_literals
-from __future__ import with_statement
-
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import six
 import sys
 import os

=== modified file 'reahl-dev/reahl/dev/exceptions.py'
--- reahl-dev/reahl/dev/exceptions.py	2014-07-26 08:39:42 +0000
+++ reahl-dev/reahl/dev/exceptions.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009, 2010, 2011, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 """Exceptions used by modules in this package."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import inspect
 
 class StatusException(Exception):

=== modified file 'reahl-dev/reahl/dev/fixtures.py'
--- reahl-dev/reahl/dev/fixtures.py	2014-07-06 10:25:15 +0000
+++ reahl-dev/reahl/dev/fixtures.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -17,8 +17,7 @@
 # Copyright (C) 2006 Reahl Software Services (Pty) Ltd.  All rights reserved. (www.reahl.org)
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.tofu import Fixture, set_up, tear_down
 
 from reahl.component.context import ExecutionContext

=== modified file 'reahl-dev/reahl/dev/mailtest.py'
--- reahl-dev/reahl/dev/mailtest.py	2014-07-06 10:25:15 +0000
+++ reahl-dev/reahl/dev/mailtest.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -20,8 +20,7 @@
 Copyright (C) 2006 Reahl Software Services (Pty) Ltd.  All rights reserved. (www.reahl.org)
 
 """
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 import asyncore
 import logging

=== modified file 'reahl-dev/reahl/dev/tools.py'
--- reahl-dev/reahl/dev/tools.py	2014-07-06 10:25:15 +0000
+++ reahl-dev/reahl/dev/tools.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 class EventTester(object):
     def __init__(self, event, **arguments):
         self.occurring_event = event.with_arguments(**arguments)

=== modified file 'reahl-dev/reahl/dev/xmlreader.py'
--- reahl-dev/reahl/dev/xmlreader.py	2014-07-06 10:25:15 +0000
+++ reahl-dev/reahl/dev/xmlreader.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2011, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,9 +16,6 @@
 
 """A generic factory that can construct Python classes from XML.
 
-from __future__ import unicode_literals
-from __future__ import print_function
-import six
 This package provides infrastructure that will read an XML file with
 clean, human readable XML and provide you with a bunch of classes that
 have been constructed and initialised according to the information in
@@ -96,6 +93,7 @@
 
 
 """
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 from xml.dom.minidom import parse
 

=== modified file 'reahl-dev/reahl/dev_dev/__init__.py'
--- reahl-dev/reahl/dev_dev/__init__.py	2013-12-05 14:13:07 +0000
+++ reahl-dev/reahl/dev_dev/__init__.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #

=== modified file 'reahl-dev/reahl/dev_dev/domaintests.py'
--- reahl-dev/reahl/dev_dev/domaintests.py	2014-07-26 08:39:42 +0000
+++ reahl-dev/reahl/dev_dev/domaintests.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -16,8 +16,7 @@
 
 """Tests for the devdomain module."""
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import six
 import os
 import os.path

=== modified file 'reahl-dev/reahl/dev_dev/xmlreadertests.py'
--- reahl-dev/reahl/dev_dev/xmlreadertests.py	2014-07-05 10:41:49 +0000
+++ reahl-dev/reahl/dev_dev/xmlreadertests.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2011, 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -17,8 +17,7 @@
 # -*- mode: python; mode: font-lock -*-
 # Copyright 2005 Iwan Vosloo
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import six
 import time
 

=== modified file 'reahl-dev/reahl_dev.egg-info/PKG-INFO'
--- reahl-dev/reahl_dev.egg-info/PKG-INFO	2014-08-24 12:09:36 +0000
+++ reahl-dev/reahl_dev.egg-info/PKG-INFO	2014-09-04 15:41:33 +0000
@@ -1,6 +1,10 @@
 Metadata-Version: 1.0
 Name: reahl-dev
+<<<<<<< TREE
 Version: 2.1.2
+=======
+Version: 3.0
+>>>>>>> MERGE-SOURCE
 Summary: The core Reahl development tools.
 Home-page: http://www.reahl.org
 Author: Iwan Vosloo

=== modified file 'reahl-dev/reahl_dev.egg-info/SOURCES.txt'
--- reahl-dev/reahl_dev.egg-info/SOURCES.txt	2014-08-24 13:32:16 +0000
+++ reahl-dev/reahl_dev.egg-info/SOURCES.txt	2014-09-04 15:41:33 +0000
@@ -18,7 +18,6 @@
 reahl/dev_dev/xmlreadertests.py
 reahl_dev.egg-info/PKG-INFO
 reahl_dev.egg-info/SOURCES.txt
-reahl_dev.egg-info/SOURCES.txt.~1~
 reahl_dev.egg-info/dependency_links.txt
 reahl_dev.egg-info/entry_points.txt
 reahl_dev.egg-info/namespace_packages.txt

=== modified file 'reahl-dev/reahl_dev.egg-info/entry_points.txt'
--- reahl-dev/reahl_dev.egg-info/entry_points.txt	2013-12-12 08:39:26 +0000
+++ reahl-dev/reahl_dev.egg-info/entry_points.txt	2014-09-04 15:41:33 +0000
@@ -1,68 +1,68 @@
+[reahl.eggs]
+Egg = reahl.component.eggs:ReahlEgg
+
 [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
+AttachmentList = reahl.dev.devdomain:AttachmentList
+XMLDependencyList = reahl.dev.devdomain:XMLDependencyList
+ProjectTag = reahl.dev.devdomain:ProjectTag
 MigrationList = reahl.dev.devdomain:MigrationList
-NamespaceEntry = reahl.dev.devdomain:NamespaceEntry
-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
+Dependency = reahl.dev.devdomain:Dependency
 SshRepository = reahl.dev.devdomain:SshRepository
-AttachmentList = reahl.dev.devdomain:AttachmentList
+BzrSourceControl = reahl.dev.devdomain:BzrSourceControl
+MetaInfo = reahl.dev.devdomain:MetaInfo
 Project = reahl.dev.devdomain:Project
-Dependency = reahl.dev.devdomain:Dependency
 CommandAlias = reahl.dev.devdomain:CommandAlias
+ScriptExport = reahl.dev.devdomain:ScriptExport
 ConfigurationSpec = reahl.dev.devdomain:ConfigurationSpec
 ExtrasList = reahl.dev.devdomain:ExtrasList
+TranslationPackage = reahl.dev.devdomain:TranslationPackage
+ScheduledJobSpec = reahl.dev.devdomain:ScheduledJobSpec
+HardcodedMetadata = reahl.dev.devdomain:HardcodedMetadata
+PersistedClassesList = reahl.dev.devdomain:PersistedClassesList
+DebianPackageSet = reahl.dev.devdomain:DebianPackageSet
+PythonSourcePackage = reahl.dev.devdomain:PythonSourcePackage
 EggProject = reahl.dev.devdomain:EggProject
-ProjectTag = reahl.dev.devdomain:ProjectTag
-HardcodedMetadata = reahl.dev.devdomain:HardcodedMetadata
+DebianPackageMetadata = reahl.dev.devdomain:DebianPackageMetadata
+NamespaceEntry = reahl.dev.devdomain:NamespaceEntry
+ThirdpartyDependency = reahl.dev.devdomain:ThirdpartyDependency
+DebianPackage = reahl.dev.devdomain:DebianPackage
+PackageIndex = reahl.dev.devdomain:PackageIndex
+ChickenProject = reahl.dev.devdomain:ChickenProject
+OrderedPersistedClass = reahl.dev.devdomain:OrderedPersistedClass
+ExtraPath = reahl.dev.devdomain:ExtraPath
 ShippedFile = reahl.dev.devdomain:ShippedFile
-XMLDependencyList = reahl.dev.devdomain:XMLDependencyList
-ChickenProject = reahl.dev.devdomain:ChickenProject
-DebianPackageMetadata = reahl.dev.devdomain:DebianPackageMetadata
-ScheduledJobSpec = reahl.dev.devdomain:ScheduledJobSpec
-PythonSourcePackage = reahl.dev.devdomain:PythonSourcePackage
+EntryPointExport = reahl.dev.devdomain:EntryPointExport
+NamespaceList = reahl.dev.devdomain:NamespaceList
+FileList = reahl.dev.devdomain:FileList
 
 [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
+DeleteSelection = reahl.dev.devshell:DeleteSelection
+UpdateAptRepository = reahl.dev.devshell:UpdateAptRepository
+ServeSMTP = reahl.dev.mailtest:ServeSMTP
 Shell = reahl.dev.devshell:Shell
 Read = reahl.dev.devshell:Read
-UpdateAptRepository = reahl.dev.devshell:UpdateAptRepository
+ListMissingDependencies = reahl.dev.devshell:ListMissingDependencies
+ExtractMessages = reahl.dev.devshell:ExtractMessages
+MergeTranslations = reahl.dev.devshell:MergeTranslations
+CompileTranslations = reahl.dev.devshell:CompileTranslations
+AddLocale = reahl.dev.devshell:AddLocale
+ExplainLegend = reahl.dev.devshell:ExplainLegend
+Setup = reahl.dev.devshell:Setup
 ListSelections = reahl.dev.devshell:ListSelections
 Info = reahl.dev.devshell:Info
+Debianise = reahl.dev.devshell:Debianise
 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
+DebInstall = reahl.dev.devshell:DebInstall
+Save = reahl.dev.devshell:Save
 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
+List = reahl.dev.devshell:List
 Select = reahl.dev.devshell:Select
+Upload = reahl.dev.devshell:Upload
 

=== modified file 'reahl-dev/reahl_dev.egg-info/requires.txt'
--- reahl-dev/reahl_dev.egg-info/requires.txt	2014-04-21 09:33:22 +0000
+++ reahl-dev/reahl_dev.egg-info/requires.txt	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-reahl-component>=2.1,<2.2
-reahl-tofu>=2.1,<2.2
-reahl-bzrsupport>=2.1,<2.2
-Babel>=0.9,<0.10
\ No newline at end of file
+reahl-component>=3.0,<3.1
+reahl-tofu>=3.0,<3.1
+reahl-bzrsupport>=3.0,<3.1
+Babel>=1.3,<1.3.9999
\ No newline at end of file

=== modified file 'reahl-doc/.reahlproject'
--- reahl-doc/.reahlproject	2014-08-05 14:00:06 +0000
+++ reahl-doc/.reahlproject	2014-09-04 15:41:33 +0000
@@ -10,7 +10,7 @@
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
     <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
     <egg name="reahl-domain"/>
     <egg name="reahl-domainui"/>
   </deps>
@@ -42,12 +42,14 @@
     <class locator="reahl.doc.examples.tutorial.access1.access1:AddressBook"/>
     <class locator="reahl.doc.examples.tutorial.access1.access1:Collaborator"/>
     <class locator="reahl.doc.examples.tutorial.access1.access1:Address"/>
+
     <class locator="reahl.doc.examples.tutorial.access2.access2:AddressBook"/>
     <class locator="reahl.doc.examples.tutorial.access2.access2:Collaborator"/>
     <class locator="reahl.doc.examples.tutorial.access2.access2:Address"/>
     <class locator="reahl.doc.examples.tutorial.access.access:AddressBook"/>
     <class locator="reahl.doc.examples.tutorial.access.access:Collaborator"/>
     <class locator="reahl.doc.examples.tutorial.access.access:Address"/>
+
     <class locator="reahl.doc.examples.tutorial.i18nexample.i18nexample:Address"/>
     <class locator="reahl.doc.examples.tutorial.componentconfig.componentconfig:Address"/>
     <class locator="reahl.doc.examples.tutorial.migrationexample.migrationexample:Address"/>

=== modified file 'reahl-doc/doc/component/index.rst'
--- reahl-doc/doc/component/index.rst	2013-12-05 14:13:07 +0000
+++ reahl-doc/doc/component/index.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2011, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Component framework
 ===================

=== modified file 'reahl-doc/doc/conf.py'
--- reahl-doc/doc/conf.py	2014-08-13 17:10:16 +0000
+++ reahl-doc/doc/conf.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2011, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -17,8 +17,7 @@
 # -*- coding: utf-8 -*-
 #
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import six
 import sys, os, datetime
 

=== added file 'reahl-doc/doc/declarativemigration.rst'
--- reahl-doc/doc/declarativemigration.rst	1970-01-01 00:00:00 +0000
+++ reahl-doc/doc/declarativemigration.rst	2014-09-04 15:41:33 +0000
@@ -0,0 +1,49 @@
+.. Copyright 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
+ 
+Elixir to Declarative migration guide
+=====================================
+
+This guide is meant for those who opt to change older Elixir-based
+model classes to use SqlALchemy Declarative instead. If you go down
+this route, you will have to change your code to use Declarative and
+you may need some Migrations for your own code. SqlAlchemy and
+Declarative have excellent documentation to help users use
+Declarative. This guide explains what changed in the database, and how
+to migrate to cater for these changes.
+
+Reahl 3.0 also includes a class you can inherit your own Migrations
+from which includes a number of handy methods related to the Elixir ->
+Declarative migration.
+
+Summary of changes
+------------------
+
+ * The new SqlAlchemy provides a mechanism for dictating the naming
+   convention used to name database objects (constraints, etc). Using
+   this means the same conventions will be used across different
+   database backends -- something that will make migrations easier in
+   future. Reahl 3.0 now uses these conventions, and they differ from
+   names chosen automatically by PostgreSQL in the past. 
+
+   This means that all of the following need to be dropped, and 
+   recreated with their new names:
+    - primary keys
+    - foreign keys
+
+ * All our Elixir classes used joined table inheritance (where they did indeed inherit).
+   Perhaps yours do too... In this case, Elixir automatically created a column on the table
+   of a child class to refer to the table of the parent class. This column if a primary key
+   but is also a foreign key to the parent. It is also used for joins to implement polymorphism.
+
+   Elixir used to include the name of the parent in this column name, ie: party_id. In your
+   own code, you can stick to that convention to ease the migration. We opted to clean house
+   and rename all these just to 'id'. 
+
+ * In the Elixir implementation, any object decorated with @session_scoped had 
+   a column (acting as foreign key) added, named 'session_id'. The name of this column
+   was changed to 'user_session_id' for clarity.
+
+   For any @session_scoped classes, this column needs to be renamed, and its associated
+   foreign key constraint should be updated.
+
+ * 

=== modified file 'reahl-doc/doc/devtools/index.rst'
--- reahl-doc/doc/devtools/index.rst	2013-12-05 14:13:07 +0000
+++ reahl-doc/doc/devtools/index.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2011, 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Development tools
 =================

=== modified file 'reahl-doc/doc/devtools/stubble.rst'
--- reahl-doc/doc/devtools/stubble.rst	2013-12-05 14:13:07 +0000
+++ reahl-doc/doc/devtools/stubble.rst	2014-09-04 15:41:33 +0000
@@ -1,8 +1,9 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Stubble -- A collection of tools for writing stubs in unit tests (reahl.stubble)
 ================================================================================
 
+
 Introduction
 ^^^^^^^^^^^^
 
@@ -81,10 +82,10 @@
       b = 123
     
       def foo(self, a):
-          print 'i am the real foo'
+          print('i am the real foo')
 
       def bar(self):
-          print 'i am the real bar'
+          print('i am the real bar')
  
 
 Basic functionality
@@ -143,7 +144,7 @@
   class Stub(object):
       @exempt
       def my_own_method(self):
-          print 'i am my own method'
+          print('i am my own method')
 
 
 Attributes
@@ -208,7 +209,7 @@
 
   #  (we just print out each class it finds...)
   for i in pkg_resources.iter_entry_points(group_name):
-      print i.load()
+      print(i.load())
 
 
 Where you tear down test fixtures after a test run, you should clear
@@ -249,6 +250,7 @@
 -----------
 
 .. autoclass:: reahl.stubble.intercept.CallMonitor
+   :inherited-members:
    :members:
 
 MonitoredCall
@@ -261,6 +263,7 @@
 -----------
 
 .. autoclass:: reahl.stubble.intercept.InitMonitor
+   :inherited-members:
    :members:
 
 replaced
@@ -346,7 +349,7 @@
       shadowed = ['foo', 'aa']
 
       def foo(self, a):
-          print 'i am a fake foo'
+          print('i am a fake foo')
  
 
 And instance of it is then created like this::

=== modified file 'reahl-doc/doc/domain/index.rst'
--- reahl-doc/doc/domain/index.rst	2013-12-05 14:13:07 +0000
+++ reahl-doc/doc/domain/index.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2011, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Domain functionality
 ====================

=== modified file 'reahl-doc/doc/domain/systemaccountui.rst'
--- reahl-doc/doc/domain/systemaccountui.rst	2014-04-18 11:34:16 +0000
+++ reahl-doc/doc/domain/systemaccountui.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Module reahl.domainui.accounts
 ------------------------------

=== modified file 'reahl-doc/doc/domain/workflowui.rst'
--- reahl-doc/doc/domain/workflowui.rst	2014-04-18 11:34:16 +0000
+++ reahl-doc/doc/domain/workflowui.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Module reahl.domainui.workflow
 ------------------------------

=== modified file 'reahl-doc/doc/features/accesscontrol.rst'
--- reahl-doc/doc/features/accesscontrol.rst	2014-04-10 11:32:33 +0000
+++ reahl-doc/doc/features/accesscontrol.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Access control example
 ======================

=== modified file 'reahl-doc/doc/features/enduserfunctionality.rst'
--- reahl-doc/doc/features/enduserfunctionality.rst	2014-08-12 13:56:25 +0000
+++ reahl-doc/doc/features/enduserfunctionality.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Off-the-shelf functionality
 ===========================

=== modified file 'reahl-doc/doc/features/i18n.rst'
--- reahl-doc/doc/features/i18n.rst	2014-04-10 11:32:33 +0000
+++ reahl-doc/doc/features/i18n.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Internationalisation
 ====================

=== modified file 'reahl-doc/doc/features/index.rst'
--- reahl-doc/doc/features/index.rst	2014-08-17 12:45:00 +0000
+++ reahl-doc/doc/features/index.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 ===============
  Reahl features

=== modified file 'reahl-doc/doc/features/layout.rst'
--- reahl-doc/doc/features/layout.rst	2014-04-20 11:21:37 +0000
+++ reahl-doc/doc/features/layout.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Layout example
 ==============

=== modified file 'reahl-doc/doc/features/pageflow.png'
Binary files reahl-doc/doc/features/pageflow.png	2013-12-05 14:13:07 +0000 and reahl-doc/doc/features/pageflow.png	2014-09-04 15:41:33 +0000 differ
=== modified file 'reahl-doc/doc/features/pageflow.rst'
--- reahl-doc/doc/features/pageflow.rst	2014-04-20 11:21:37 +0000
+++ reahl-doc/doc/features/pageflow.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Reacting to user events
 =======================

=== modified file 'reahl-doc/doc/features/persistence.rst'
--- reahl-doc/doc/features/persistence.rst	2014-04-10 11:32:33 +0000
+++ reahl-doc/doc/features/persistence.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Persistence
 ===========

=== modified file 'reahl-doc/doc/features/security.rst'
--- reahl-doc/doc/features/security.rst	2013-12-05 14:13:07 +0000
+++ reahl-doc/doc/features/security.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Security considerations
 =======================

=== modified file 'reahl-doc/doc/features/tabbedpanel.rst'
--- reahl-doc/doc/features/tabbedpanel.rst	2014-04-18 14:00:05 +0000
+++ reahl-doc/doc/features/tabbedpanel.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 A tabbed panel example
 ======================

=== modified file 'reahl-doc/doc/features/tools.rst'
--- reahl-doc/doc/features/tools.rst	2013-12-05 14:13:07 +0000
+++ reahl-doc/doc/features/tools.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Tool support
 ============

=== modified file 'reahl-doc/doc/features/validation.rst'
--- reahl-doc/doc/features/validation.rst	2014-04-10 11:32:33 +0000
+++ reahl-doc/doc/features/validation.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Validating user input
 =====================

=== modified file 'reahl-doc/doc/features/views.png'
Binary files reahl-doc/doc/features/views.png	2013-12-05 14:13:07 +0000 and reahl-doc/doc/features/views.png	2014-09-04 15:41:33 +0000 differ
=== modified file 'reahl-doc/doc/index.rst'
--- reahl-doc/doc/index.rst	2014-04-21 09:27:25 +0000
+++ reahl-doc/doc/index.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2011, 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Reahl documentation
 ===================

=== modified file 'reahl-doc/doc/overview.png'
Binary files reahl-doc/doc/overview.png	2013-12-05 14:13:07 +0000 and reahl-doc/doc/overview.png	2014-09-04 15:41:33 +0000 differ
=== modified file 'reahl-doc/doc/overview.rst'
--- reahl-doc/doc/overview.rst	2014-04-10 11:32:33 +0000
+++ reahl-doc/doc/overview.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2011, 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Overview
 ========
@@ -61,8 +61,8 @@
 The core of the web framework is written such that it is independent
 of the technology used for object persistence. This core is in the
 `reahl-web` component. The web framework does use some objects that
-are persisted though -- an implementation of these using Elixir is
-provided in `reahl-web-elixirimpl`.
+are persisted though -- an implementation of these using SqlAlchemy's 
+declarative is provided in `reahl-web-declarative`.
 
 These components are discussed under :doc:`web/index`.
 

=== modified file 'reahl-doc/doc/overview.svg'
--- reahl-doc/doc/overview.svg	2013-12-05 14:13:07 +0000
+++ reahl-doc/doc/overview.svg	2014-09-04 15:41:33 +0000
@@ -13,7 +13,7 @@
    height="372.04724"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="overview.svg">
   <defs
      id="defs4" />
@@ -356,13 +356,13 @@
     <text
        xml:space="preserve"
        style="font-size:11px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="63.396584"
+       x="55.396584"
        y="779.86212"
        id="text3781-2-0-0"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan3783-1-7-1"
-         x="63.396584"
+         x="55.396584"
          y="779.86212">reahl-web</tspan></text>
     <rect
        style="fill:none;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:0.5, 0.5;stroke-dashoffset:0"
@@ -375,14 +375,14 @@
     <text
        xml:space="preserve"
        style="font-size:11px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="63.396584"
+       x="55.396584"
        y="809.86218"
        id="text3781-2-9-7-1"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan3783-1-9-6-5"
-         x="63.396584"
-         y="809.86218">reahl-web-elixirimpl</tspan></text>
+         x="55.396584"
+         y="809.86218">reahl-web-declarative</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:AlHor;-inkscape-font-specification:AlHor"

=== modified file 'reahl-doc/doc/tutorial/accessapp.png'
Binary files reahl-doc/doc/tutorial/accessapp.png	2013-12-05 14:13:07 +0000 and reahl-doc/doc/tutorial/accessapp.png	2014-09-04 15:41:33 +0000 differ
=== modified file 'reahl-doc/doc/tutorial/accesscontrolinc2.rst'
--- reahl-doc/doc/tutorial/accesscontrolinc2.rst	2014-04-18 14:12:05 +0000
+++ reahl-doc/doc/tutorial/accesscontrolinc2.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 The user interface -- without access control
 ============================================

=== modified file 'reahl-doc/doc/tutorial/accessmodel.png'
Binary files reahl-doc/doc/tutorial/accessmodel.png	2013-12-05 14:13:07 +0000 and reahl-doc/doc/tutorial/accessmodel.png	2014-09-04 15:41:33 +0000 differ
=== modified file 'reahl-doc/doc/tutorial/buttonwidgets.rst'
--- reahl-doc/doc/tutorial/buttonwidgets.rst	2014-06-29 16:29:48 +0000
+++ reahl-doc/doc/tutorial/buttonwidgets.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Buttons allow users to act
 ==========================

=== modified file 'reahl-doc/doc/tutorial/connectingviews.rst'
--- reahl-doc/doc/tutorial/connectingviews.rst	2014-04-19 09:02:25 +0000
+++ reahl-doc/doc/tutorial/connectingviews.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Moving between Views
 ====================

=== modified file 'reahl-doc/doc/tutorial/dependencyinjection.rst'
--- reahl-doc/doc/tutorial/dependencyinjection.rst	2013-12-05 14:13:07 +0000
+++ reahl-doc/doc/tutorial/dependencyinjection.rst	2014-09-04 15:41:33 +0000
@@ -1,13 +1,13 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Using a different persistence mechanism
 =======================================
 
 The Reahl framework itself contains a few classes that need to be
-persisted to a database. For example, the :class:`~reahl.webelixirimpl.WebUserSession` is an object
+persisted to a database. For example, the :class:`~reahl.webdeclarative.webdeclarative.WebUserSession` is an object
 that represents the :class:`~reahl.systemaccountmodel.UserSession`, and is needed for all the :class:`~reahl.systemaccountmodel.UserSession`\ -related
 features explained in :doc:`sessions`. There is a handful of other
-classes that work in concert with the :class:`~reahl.webelixirimpl.WebUserSession`.
+classes that work in concert with the :class:`~reahl.webdeclarative.webdeclarative.WebUserSession`.
 
 These persisted classes are written using a specific object
 persistence technology. The technology used throughout this tutorial
@@ -88,7 +88,7 @@
 As explained at the beginning of this section, the `reahl-web`
 component needs a number of classes that are provided by a different
 component. The Elixir-based implementation of these classes live in
-the `reahl-web-elixirimpl` component which in turn is written using
+the `reahl-web-declarative` component which in turn is written using
 the `reahl-domain` component. Diagramatically this is the scenario:
 
 .. figure:: depinjection.png
@@ -96,9 +96,9 @@
    :width: 90%
 
 Normally, `reahl-web` would merely import the classes it needs from
-`reahl-web-elixirimpl`, but that would make `reahl-web` dependent on
-`reahl-web-elixir` without any possibility to swap
-`reahl-web-elixirimpl` out for a different implementation. So,
+`reahl-web-declarative`, but that would make `reahl-web` dependent on
+`reahl-web-declarative` without any possibility to swap
+`reahl-web-declarative` out for a different implementation. So,
 instead, the `reahl-web` component discovers the actual classes it
 should use during run-time, when an application starts up. The
 mechanism used to do this is simply the configuration of `reahl-web`:
@@ -123,25 +123,25 @@
 Instead, there's a bit of a twist to the configuration mechanism to
 make it usable for this purpose without the need for users to write
 anything in a configuration file: One component can set parts of the
-configuration of another. Hence, the `reahl-web-elixirimpl` component
+configuration of another. Hence, the `reahl-web-declarative` component
 itself modifies the configuration of `reahl-web` to supply these
 special settings -- without any need for a user to configure anything.
 
 A :class:`~reahl.component.config.Configuration` class can optionally have a method
 `.do_injections()`. This method is called after that configuration has
 been read. When called, it is passed the entire configuration of the
-system. The programmer of `reahl-web-elixirimpl` can thus write code
+system. The programmer of `reahl-web-declarative` can thus write code
 in this method to supply or change the configuration of any component
 that has been read by this time. To ensure that the configuration of
-`reahl-web` is read before that of `reahl-web-elixirimpl`,
-`reahl-web-elixirimpl` is declared to be dependent on `reahl-web` in
+`reahl-web` is read before that of `reahl-web-declarative`,
+`reahl-web-declarative` is declared to be dependent on `reahl-web` in
 its `.reahlproject` file (an **inverted dependency**).
 
 Here is the :class:`~reahl.component.config.Configuration` of the
-`reahl-web-elixirimpl` component:
+`reahl-web-declarative` component:
 
-.. literalinclude:: ../../../reahl-web-elixirimpl/reahl/webelixirimpl.py
-   :pyobject: ElixirImplConfig
+.. literalinclude:: ../../../reahl-web-declarative/reahl/webdeclarative/webdeclarative.py
+   :pyobject: WebDeclarativeConfig
 
 (The classes assigned here are defined higher up in the same file.)
 

=== modified file 'reahl-doc/doc/tutorial/depinjection.png'
Binary files reahl-doc/doc/tutorial/depinjection.png	2013-12-05 14:13:07 +0000 and reahl-doc/doc/tutorial/depinjection.png	2014-09-04 15:41:33 +0000 differ
=== modified file 'reahl-doc/doc/tutorial/depinjection.svg'
--- reahl-doc/doc/tutorial/depinjection.svg	2013-12-05 14:13:07 +0000
+++ reahl-doc/doc/tutorial/depinjection.svg	2014-09-04 15:41:33 +0000
@@ -222,7 +222,7 @@
          sodipodi:role="line"
          id="tspan3300"
          x="392.1449"
-         y="85.674118">reahl-web-elixir-impl</tspan></text>
+         y="85.674118">reahl-web-declarative</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:7.34066439px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"

=== modified file 'reahl-doc/doc/tutorial/deployment.rst'
--- reahl-doc/doc/tutorial/deployment.rst	2014-04-20 11:45:35 +0000
+++ reahl-doc/doc/tutorial/deployment.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Deploying a production site
 ===========================

=== modified file 'reahl-doc/doc/tutorial/exampleapp.rst'
--- reahl-doc/doc/tutorial/exampleapp.rst	2014-08-16 10:42:37 +0000
+++ reahl-doc/doc/tutorial/exampleapp.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 An application that actually does something
 ===========================================

=== modified file 'reahl-doc/doc/tutorial/gettingstarted-develop.rst'
--- reahl-doc/doc/tutorial/gettingstarted-develop.rst	2014-08-28 08:23:41 +0000
+++ reahl-doc/doc/tutorial/gettingstarted-develop.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Get developing with Reahl
 =========================
@@ -47,8 +47,8 @@
 
 .. _create-component:
 
-Creating a Reahl component
---------------------------
+Create a Reahl component
+------------------------
 
 In Reahl, everything -- even your web application -- is a component
 (and, Reahl components are Python eggs). The very first thing to do in
@@ -72,13 +72,13 @@
    reahl-web
      The Reahl web framework itself.
 
-   reahl-web-elixirimpl
+   reahl-web-declarative
      An implementation of technology-dependent bits of Reahl, using
-     using `SqlAlchemy <http://sqlalchemy.org>`_ and `Elixir <http://elixir.ematia.de/>`_.  
+     using `SqlAlchemy <http://sqlalchemy.org>`__.
 
    reahl-sqlalchemysupport
-     The necessary glue for using `SqlAlchemy <http://www.sqlalchemy.org/>`_ (and
-     `Elixir <http://elixir.ematia.de/trac/wiki>`_) with a Reahl program.
+     The necessary glue for using `SqlAlchemy <http://www.sqlalchemy.org/>`__ 
+     with a Reahl program.
 
 The presence of the .reahlproject file in a directory alerts the
 `reahl` script (a tool used while in development) that the directory
@@ -95,14 +95,14 @@
        <egg name="reahl-component"/>
        <egg name="reahl-web"/>
        <egg name="reahl-sqlalchemysupport"/>
-       <egg name="reahl-web-elixirimpl"/>
+       <egg name="reahl-web-declarative"/>
      </deps>
    </project>
 
 .. _preparing-for-development:
 
-Preparing for development
--------------------------
+Prepare the component for development
+-------------------------------------
 
 Before you can do anything with a new component, you need to register
 it with your development environment. This is done by executing the
@@ -199,8 +199,8 @@
   reahl-control listconfig -h etc
 
 
-Preparing the database
-----------------------
+Prepare the database
+--------------------
 
 The last step necessary before the web application can be started is to create a
 database for it. This is necessary for any web application because the
@@ -225,8 +225,8 @@
    to alert a user of such "dangerous" default config values.
 
 
-Running it
-----------
+Run it
+------
 
 It is not necessary to install a web server in your development
 environment. To run your application just execute the following from
@@ -238,10 +238,12 @@
 and see a page which looks empty and is titled "Home".
 
 
-Checking out an example
------------------------
+Check out an example
+--------------------
 
-You can get a local copy of this example by using the `reahl` script::
+Throughout the Reahl documentation (and this tutorial) examples are
+provided. You can get a local copy of *this* example by using the 
+`reahl` script::
 
   reahl example tutorial.hello
 

=== modified file 'reahl-doc/doc/tutorial/gettingstarted-install.rst'
--- reahl-doc/doc/tutorial/gettingstarted-install.rst	2014-08-19 06:23:54 +0000
+++ reahl-doc/doc/tutorial/gettingstarted-install.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Reahl installation
 ==================
@@ -47,6 +47,12 @@
 
    virtualenv ./reahl_env
 
+.. note:: 
+
+   If you have more than one version of Python installed, also pass the `-p` argument
+   to virtualenv, specifying the path to the Python interpreter you want this
+   virtualenv for.
+
 On Windows, do (in a command shell):
 
 .. code-block:: bash
@@ -74,6 +80,7 @@
 After activating your new environment, the prompt of the command line
 changes to reflect the environment that is currently active.
 
+<<<<<<< TREE
 .. sidebar:: For interest's sake
 
    Installing ``reahl[elixir,sqlite,dev,doc]`` results in an installation of
@@ -90,12 +97,18 @@
 
       easy_install reahl[postgresql]
 
+=======
+>>>>>>> MERGE-SOURCE
 With your `virtualenv` activated, Reahl can be installed into it by
 issuing:
 
 .. code-block:: bash
 
+<<<<<<< TREE
    easy_install reahl[elixir,sqlite,dev,doc]
+=======
+   easy_install reahl[declarative,sqlite,dev,doc]
+>>>>>>> MERGE-SOURCE
 
 .. note::
 
@@ -109,3 +122,39 @@
 properly for Python development <prep_install>` before you attempt to
 install Reahl.
 
+Choose what to install
+----------------------
+
+Reahl is composed of a number of different components that you
+can mix and match depending on your requirements. For example, 
+you probably do not want the development tools in a production
+environment, so they are packaged in a component you can omit.
+
+In order to specify which sets of components you want installed,
+you use keywords in square brackets behind `reahl` in the command
+to easy_install as shown above. Here is a list of keywords you can 
+include, and what they install:
+
+ declarative
+   The declarative implementation of the web framework
+
+ dev
+   The development tools
+
+ doc
+   Documentation and examples
+
+ sqlite
+   Support for sqlite databases
+
+ postgresql
+   Support for postgresql databases 
+ 
+ elixir
+   Support for the older Elixir-based implementation of
+   the web framework (uses some components from the 2.1 
+   series, and only runs on Python 2.7)
+
+
+
+

=== modified file 'reahl-doc/doc/tutorial/gettingstarted.rst'
--- reahl-doc/doc/tutorial/gettingstarted.rst	2014-08-19 06:23:54 +0000
+++ reahl-doc/doc/tutorial/gettingstarted.rst	2014-09-04 15:41:33 +0000
@@ -1,5 +1,10 @@
+<<<<<<< TREE
 .. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
 
+=======
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
+
+>>>>>>> MERGE-SOURCE
  
 Getting started with Reahl
 ==========================
@@ -15,10 +20,8 @@
     - `virtualenv <http://pypi.python.org/pypi/virtualenv>`_
     - `distribute <http://pypi.python.org/pypi/distribute>`_
     - `nosetests <https://nose.readthedocs.org/en/latest/>`_
-    - `SqlAlchemy <http://www.sqlalchemy.org/>`_
-    - `Alembic <https://pypi.python.org/pypi/alembic/>`_; and
-    - `Elixir <http://elixir.ematia.de/trac/wiki>`_ (optional, but used
-      in the tutorial).
+    - `SqlAlchemy <http://www.sqlalchemy.org/>`_; and
+    - `Alembic <https://pypi.python.org/pypi/alembic/>`_.
 
    There are also projects that are used almost totally behind the
    scenes.  The most visible of these is a database back-end. For this
@@ -30,8 +33,13 @@
 Follow this guide to get Reahl installed in your development
 environment and to get a skeleton web application going.
 
+<<<<<<< TREE
 This version of Reahl requires at least version 2.7 of Python. Check out
 Reahl 3.0 and later for Python 3 support.
+=======
+This version of Reahl requires version 2.7 of Python 2 or versions
+of Python greater than 3.3.
+>>>>>>> MERGE-SOURCE
 
 We have split the guide into parts:
 

=== modified file 'reahl-doc/doc/tutorial/i18n.rst'
--- reahl-doc/doc/tutorial/i18n.rst	2014-04-18 14:12:05 +0000
+++ reahl-doc/doc/tutorial/i18n.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Internationalised applications
 ==============================

=== modified file 'reahl-doc/doc/tutorial/index.rst'
--- reahl-doc/doc/tutorial/index.rst	2014-06-29 16:29:48 +0000
+++ reahl-doc/doc/tutorial/index.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Tutorial
 ========

=== modified file 'reahl-doc/doc/tutorial/inputwidgets.rst'
--- reahl-doc/doc/tutorial/inputwidgets.rst	2014-06-29 16:29:48 +0000
+++ reahl-doc/doc/tutorial/inputwidgets.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Getting input from a user
 =========================
@@ -68,8 +68,8 @@
 To augment our Address class with :class:`~reahl.component.modelinterface.Field`\ s, create a special method `fields()` on the class, and annotate it with the `@exposed` decorator. Such a method should take one argument: `fields` on which you can set each :class:`~reahl.component.modelinterface.Field` needed. Take care though -- each :class:`~reahl.component.modelinterface.Field` you create will eventually manipulate an attribute of the same name on instances of your class:
 
 .. literalinclude:: ../../reahl/doc/examples/tutorial/addressbook2/addressbook2.py
-   :prepend: class Address(elixir.Entity):
-   :start-after: class Address(elixir.Entity):
+   :prepend: class Address(Base):
+   :start-after: class Address(Base):
    :end-before: def save(self):
 
 The `@exposed` decorator turns your `fields()` method into a property

=== modified file 'reahl-doc/doc/tutorial/install-ubuntu.rst'
--- reahl-doc/doc/tutorial/install-ubuntu.rst	2014-03-15 08:19:34 +0000
+++ reahl-doc/doc/tutorial/install-ubuntu.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Preparing for installation on Ubuntu
 ====================================

=== modified file 'reahl-doc/doc/tutorial/install-win.rst'
--- reahl-doc/doc/tutorial/install-win.rst	2014-04-03 19:06:57 +0000
+++ reahl-doc/doc/tutorial/install-win.rst	2014-09-04 15:41:33 +0000
@@ -19,7 +19,7 @@
 
 Here is the super-short summary:
 
-- Download Python 2.7 from `the official website <http://python.org/>`_, and install it.
+- Download Python from `the official website <http://python.org/>`_ (version 2.7 or 3.3), and install it.
 - Ensure that your path includes both the directory where the Python executable is located as well as Python's "Scripts" directory.
 - Install setuptools:
     - download `ez_setup.py <https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py>`_ from the setuptools project on bitbucket.

=== modified file 'reahl-doc/doc/tutorial/loggingin.rst'
--- reahl-doc/doc/tutorial/loggingin.rst	2014-04-20 11:21:37 +0000
+++ reahl-doc/doc/tutorial/loggingin.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Re-use: Allowing users to log in to your system
 ===============================================

=== modified file 'reahl-doc/doc/tutorial/models.rst'
--- reahl-doc/doc/tutorial/models.rst	2014-06-29 16:29:48 +0000
+++ reahl-doc/doc/tutorial/models.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 A basic model
 =============

=== modified file 'reahl-doc/doc/tutorial/owncomponent.rst'
--- reahl-doc/doc/tutorial/owncomponent.rst	2014-08-24 11:22:20 +0000
+++ reahl-doc/doc/tutorial/owncomponent.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Developing your own component
 =============================

=== modified file 'reahl-doc/doc/tutorial/ownwidget.rst'
--- reahl-doc/doc/tutorial/ownwidget.rst	2014-08-12 13:56:25 +0000
+++ reahl-doc/doc/tutorial/ownwidget.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Developing your own Widgets
 ===========================

=== modified file 'reahl-doc/doc/tutorial/parameterised.png'
Binary files reahl-doc/doc/tutorial/parameterised.png	2013-12-05 14:13:07 +0000 and reahl-doc/doc/tutorial/parameterised.png	2014-09-04 15:41:33 +0000 differ
=== modified file 'reahl-doc/doc/tutorial/parameterised.rst'
--- reahl-doc/doc/tutorial/parameterised.rst	2014-06-29 16:29:48 +0000
+++ reahl-doc/doc/tutorial/parameterised.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Parameterised  Views
 ====================

=== modified file 'reahl-doc/doc/tutorial/persistence.rst'
--- reahl-doc/doc/tutorial/persistence.rst	2014-06-29 16:29:48 +0000
+++ reahl-doc/doc/tutorial/persistence.rst	2014-09-04 15:41:33 +0000
@@ -23,51 +23,55 @@
 to a database to avoid losing them. This is especially true for web
 applications.
 
-Persisting a model using Elixir
--------------------------------
+Persisting a model using SqlAlchemy
+-----------------------------------
 
+The problem of mapping Object Oriented models to relational databases
+is a considerable headache, but necessary if you want to work in
+an Object Oriented programming language like Python!
 Reahl does not implement persistence mechanisms by itself. That's a
 tough nut to crack. Besides there are cool tools for persisting
 objects in Python. Reahl merely provides some glue so these tools can
-be used easily. `SqlAlchemy <http://www.sqlalchemy.org/>`_ and its
-companion project, `Elixir <http://elixir.ematia.de/trac/wiki>`_ work
-in unison to deal with this persistence problem. If you are not
-familiar with these tools, please refer to their respective
-documentation.
+be used easily. `SqlAlchemy <http://www.sqlalchemy.org/>`_ 
+deals with this persistence problem. 
 
-Let's shift to a more real world model for an address book
-application. If Address instances can be persisted in a database, 
-an AddressBook is not needed anymore. An AddressBook was merely the
-thing that held on to our Addresses and the database does the job
-just as well, if not better.
+Let's shift to a more real world model for an address book application
+that uses SqlAlchemy for persistence. If Address instances can be
+persisted in a database, an AddressBook is not needed anymore. An
+AddressBook was merely the thing that held on to our Addresses and the
+database does the job just as well, if not better.
 
 That leaves a model consisting of a single class:
 
 .. literalinclude:: ../../reahl/doc/examples/tutorial/modeltests2.py
-   :lines: 3-4
+   :lines: 5-7
 
 .. literalinclude:: ../../reahl/doc/examples/tutorial/modeltests2.py
    :pyobject: Address
 
-This shows mostly Elixir/SqlAlchemy stuff (which you should be
-familiar with from reading up on those projects), with a little Reahl
-help. Notice that Session and metadata are imported from a Reahl
-package. These are provided for working with Elixir/SqlAlchemy in a
-Reahl program.
-
-Elixir needs to be told to use the Session and metadata provided by
-Reahl, and that's what the `using_options()` call is for.
-
-The call to `using_mapper_options()` is needed because by default any
-Elixir Entity is immediately saved to the database upon creation and
-that's not really what we want in this example. We want to be able to
-create an Address in memory, but will only save it to the database
-later on if the user decides to click on the "Save" button.
-
-Of course, the assignment of `elixir.Field` instances to
-`email_address` and `name` is how one instructs Elixir to persist
-these data items to the database for a particular Address
-instance (but you already knew that).
+This shows mostly SqlAlchemy stuff, with a little Reahl help. Notice
+that Session, Base and metadata are imported from a Reahl
+package. These are provided for working with SqlAlchemy in a Reahl
+program.
+
+A discussion of SqlAlchemy is outside the scope of this tutorial, but here
+are some pointers to readers unfamiliar with SqlAlchemy:
+
+In order to map Address to a relational database table, we use SqlALchemy's
+Declarative extension:
+
+  * __tablename__ states which relational table Address instances go into
+  * The assignment of `Column` instances to
+    `email_address` and `name` states that those attributes of Address
+    are to be inserted in similarly named columns on the relational database
+    that are defined as per the Columns stated.
+  * The id `Column` provides a unique identifier for each Address instance 
+    (and is also its primary key in the database)
+  * To actually persist an Address instance to the database, 
+    `Session.add()` is called.
+
+If you are not familiar with SqlAlchemy, please refer to its
+documentation: no short introduction can ever do it justice.
 
 Exercising a persistent model
 -----------------------------
@@ -91,7 +95,7 @@
 
    Have you noticed how the first few lines of the `test_model()`
    connects to the database, ensuring that its schema is created for
-   the test run? That is all standard Elixir/SqlAlchemy without any
+   the test run? That is all standard SqlAlchemy without any
    Reahl influence.
 
    In a complete Reahl program, none of this database housekeeping is

=== modified file 'reahl-doc/doc/tutorial/sessions.png'
Binary files reahl-doc/doc/tutorial/sessions.png	2013-12-05 14:13:07 +0000 and reahl-doc/doc/tutorial/sessions.png	2014-09-04 15:41:33 +0000 differ
=== modified file 'reahl-doc/doc/tutorial/sessions.rst'
--- reahl-doc/doc/tutorial/sessions.rst	2014-06-29 16:29:48 +0000
+++ reahl-doc/doc/tutorial/sessions.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 The web session problem
 =======================
@@ -98,8 +98,7 @@
 onto the :class:`~reahl.systemaccountmodel.UserSession` so that it is discoverable for a particular
 :class:`~reahl.systemaccountmodel.UserSession`.
 
-When using Elixir (as is done throughout the tutorial thus far),
-creating an Entity that has a `session scoped` lifetime is really
+When using SqlAlchemy, creating an object that has a `session scoped` lifetime is really
 easy: just use the `@session_scoped` class decorator:
 
 .. literalinclude:: ../../reahl/doc/examples/tutorial/sessionscope/sessionscope.py
@@ -109,7 +108,7 @@
 The responsibility of a LoginSession starts by keeping track of who is
 logged in. That is why it has a `.current_user` attribute. Since
 LoginSession is a persisted object itself, it is trivial to make it
-hold onto another persisted object (User) via a ManyToOne relationship.
+hold onto another persisted object (User) via a relationship.
 
 The other responsibility of the LoginSession is to actually log someone
 in. The logic of doing this is quite easily followed by looking at

=== modified file 'reahl-doc/doc/tutorial/slots.rst'
--- reahl-doc/doc/tutorial/slots.rst	2014-04-20 11:45:35 +0000
+++ reahl-doc/doc/tutorial/slots.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013,2014 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Make light work of similar-looking pages
 ========================================

=== modified file 'reahl-doc/doc/tutorial/styling.rst'
--- reahl-doc/doc/tutorial/styling.rst	2014-08-12 13:56:25 +0000
+++ reahl-doc/doc/tutorial/styling.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 
 Styling your application
 ========================

=== modified file 'reahl-doc/doc/tutorial/testing.rst'
--- reahl-doc/doc/tutorial/testing.rst	2014-08-28 08:23:41 +0000
+++ reahl-doc/doc/tutorial/testing.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Testing
 =======

=== modified file 'reahl-doc/doc/tutorial/uibasics.rst'
--- reahl-doc/doc/tutorial/uibasics.rst	2014-08-12 13:56:25 +0000
+++ reahl-doc/doc/tutorial/uibasics.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 User interface basics
 =====================

=== modified file 'reahl-doc/doc/tutorial/views.png'
Binary files reahl-doc/doc/tutorial/views.png	2013-12-05 14:13:07 +0000 and reahl-doc/doc/tutorial/views.png	2014-09-04 15:41:33 +0000 differ
=== modified file 'reahl-doc/doc/web/dhtml.rst'
--- reahl-doc/doc/web/dhtml.rst	2014-04-18 11:36:58 +0000
+++ reahl-doc/doc/web/dhtml.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Module reahl.web.dhtml
 -----------------------

=== modified file 'reahl-doc/doc/web/fw.rst'
--- reahl-doc/doc/web/fw.rst	2014-04-18 12:56:21 +0000
+++ reahl-doc/doc/web/fw.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Module reahl.web.fw
 -------------------

=== modified file 'reahl-doc/doc/web/index.rst'
--- reahl-doc/doc/web/index.rst	2014-04-18 11:36:58 +0000
+++ reahl-doc/doc/web/index.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2011, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Web framework
 =============

=== modified file 'reahl-doc/doc/web/ui.rst'
--- reahl-doc/doc/web/ui.rst	2014-08-16 10:42:37 +0000
+++ reahl-doc/doc/web/ui.rst	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-.. Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+.. Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
 Module reahl.web.ui
 -------------------

=== modified file 'reahl-doc/doc/whatchanged.rst'
--- reahl-doc/doc/whatchanged.rst	2014-08-24 18:58:10 +0000
+++ reahl-doc/doc/whatchanged.rst	2014-09-04 15:41:33 +0000
@@ -1,8 +1,9 @@
 .. Copyright 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
  
-What changed in version 2.1
+What changed in version 3.0
 ===========================
 
+<<<<<<< TREE
 Based on some feedback from first users, changes were made to simplify
 the learning curve of getting to know Reahl.  Backwards-compatibility
 remains, just in case...
@@ -60,3 +61,113 @@
 Deprecation warnings are now shown when running tests. Reahl's own deprecation warnings
 used to use the logging system, but are also now using Python's standard warnings module.
 
+=======
+.. toctree::
+   :hidden:
+ 
+   declarativemigration
+
+Python 3 support
+----------------
+
+This version of Reahl runs on Python 3 (>= 3.3) as well on Python 2.7. In 
+order to achieve this, some major changes were necessary.
+
+Updated dependencies
+--------------------
+
+Many of the versions of other packages Reahl 2.1 depends on do not
+support Python 3. Thus, almost all dependencies were upgraded to 
+versions compatible with Python 3. Most of these should go unnoticed
+to users of Reahl, barring the exception discussed next.
+
+The minor upgrades are:
+
+   ================= ============= ========================
+    Name              Old version   New version 
+   ================= ============= ========================
+    Babel             0.9           1.3  
+    python-dateutil   1.5           2.2  
+    docutils          0.8           0.12  
+    psycopg2          2.4           2.5  
+    alembic           0.5           0.6  
+    lxml              3.2           3.3  
+    WebTest           1.4           2.0  
+    selenium          2.25          2.42  
+    pillow            1.7.8         2.5  
+    cssmin            0.1           0.2  
+    BeautifulSoup     3.2           BeautifulSoup4 4.3  
+    webob             3.2           4.3  
+   ================= ============= ========================
+  
+
+SqlAlchemy and Elixir/Declarative
+---------------------------------
+
+SqlAlchemy had to be upgraded from version 0.7 to 0.9. Unfortunately
+Elixir does not support these newer versions of SqlAlchemy, prompting
+us to implement the framework and all examples using `SqlAlchemy's declarative 
+extension instead <http://docs.sqlalchemy.org/en/rel_0_9/orm/extensions/declarative.html>`_.
+
+This is a major change which is necessary to make Python 3 support possible. 
+The switch from Elixir to Declarative impacts model code built on previous versions of Reahl,
+using Elixir.
+
+We provide two upgrade paths for users with code based on Elixir:
+
+ 1. Reahl 3.0 can be used in conjunction with a few components of
+    Reahl 2.1: the Elixir implementation itself, and its small number 
+    of dependencies. Following this path means there are no code changes 
+    on your part, but you have to stay on Python 2.7 yourself. 
+
+    In order to follow this route, specify the elixir keyword to 
+    easy_install when upgrading or installing reahl, eg::
+
+       easy_install reahl[web,elixir,sqlite] --upgrade
+
+ 2. Change your own code to use Declarative instead of Elixir. The 
+    declarative implementation provided with Reahl 3.0 includes 
+    migrations that change existing database schemas created by the
+    Elixir implementation to work with the current, Declarative 
+    implementation. (This, of course, is necessary if you need to
+    preserve a running database through such changes.)
+
+.. note::
+   
+   The Sqlite database does not support migration of existing data
+   very well, and as a result migration is only possible on PostgreSQL
+   databases.
+    
+
+:doc:`Elixir to Declarative migration guide <declarativemigration>`
+-------------------------------------------------------------------
+
+For any of your own code that gets changed over from Elixir to
+Declarative, you will have to write migrations yourself.
+
+Please see the :doc:`declarativemigration` for details on how to do this,
+or discuss on `the mailing list <https://groups.google.com/forum/#!forum/reahl-discuss>`_.
+
+
+Moved modules
+-------------
+
+As a rule, a component named reahl-xxx would contain a package
+reahl.xxx, with possibly sub modules, such as reahl.xxx.yyy. For a
+small number of components, this is not true. Specifically,
+reahl-domain includes reahl.partymodel, reahl.workflowmodel and
+reahl.systemaccountmodel that do not fit this structure.
+
+In this version, these have been moved to reahl.domain.partymodel,
+reahl.domain.workflowmodel and reahl.domain.systemaccountmodel
+respectively. Older imports will continue to work for now, but 
+will eventually be removed.
+
+Renamed attributes
+------------------
+
+Classes that are @session_scoped used to have an attribute 'session'. This has been renamed to 'user_session'.
+
+
+Previously, a Party always had a SystemAccount. It makes more sense to be able to have Party objects with or without SystemAccounts. Hence, the relationship was changed. Now, a Party does not have any knowledge of a SystemAccount, but a SystemAccount has an 'owner', which is a Party.
+>>>>>>> MERGE-SOURCE

=== modified file 'reahl-doc/etc/componentconfig.config.py'
--- reahl-doc/etc/componentconfig.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/etc/componentconfig.config.py	2014-09-04 15:41:33 +0000
@@ -1,3 +1,2 @@
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 componentconfig.showheader = True

=== modified file 'reahl-doc/etc/reahl.config.py'
--- reahl-doc/etc/reahl.config.py	2013-12-05 14:13:07 +0000
+++ reahl-doc/etc/reahl.config.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,5 @@
-# Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+from __future__ import print_function, unicode_literals, absolute_import, division
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,7 +16,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#reahlsystem.connection_uri = 'postgres://rhug:rhug@localhost/rhug'
+reahlsystem.connection_uri = 'postgresql://rhug:rhug@localhost/rhug'
 #reahlsystem.connection_uri = 'sqlite:////tmp/hj.db'
 #reahlsystem.connection_uri = 'sqlite:///:memory:'
 #reahlsystem.debug = True

=== modified file 'reahl-doc/etc/web.config.py'
--- reahl-doc/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -14,8 +14,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface
 
 web.site_root = UserInterface

=== modified file 'reahl-doc/reahl/__init__.py'
--- reahl-doc/reahl/__init__.py	2014-07-05 10:41:49 +0000
+++ reahl-doc/reahl/__init__.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2006, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -25,8 +25,7 @@
 
 """ 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 __import__('pkg_resources').declare_namespace(__name__)
 

=== modified file 'reahl-doc/reahl/doc/basichtmlinputs-etc/reahl.config.py'
--- reahl-doc/reahl/doc/basichtmlinputs-etc/reahl.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/basichtmlinputs-etc/reahl.config.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -14,8 +14,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 reahlsystem.root_egg = 'reahl-doc'
 reahlsystem.debug = True
 

=== modified file 'reahl-doc/reahl/doc/basichtmlinputs-etc/web.config.py'
--- reahl-doc/reahl/doc/basichtmlinputs-etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/basichtmlinputs-etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.basichtmlinputs import BasicHTMLInputsUI
 
 web.site_root = BasicHTMLInputsUI

=== modified file 'reahl-doc/reahl/doc/basichtmlinputs.py'
--- reahl-doc/reahl/doc/basichtmlinputs.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/basichtmlinputs.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface
 from reahl.web.ui import TwoColumnPage, Panel, Form, TextInput, Button, Form, \
                           LabelOverInput, CueInput, CheckboxInput, TextInput, \

=== modified file 'reahl-doc/reahl/doc/basichtmlwidgets-etc/reahl.config.py'
--- reahl-doc/reahl/doc/basichtmlwidgets-etc/reahl.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/basichtmlwidgets-etc/reahl.config.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -14,8 +14,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 reahlsystem.root_egg = 'reahl-doc'
 
 

=== modified file 'reahl-doc/reahl/doc/basichtmlwidgets-etc/web.config.py'
--- reahl-doc/reahl/doc/basichtmlwidgets-etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/basichtmlwidgets-etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.basichtmlwidgets import BasicHTMLWidgetsUI
 
 web.site_root = BasicHTMLWidgetsUI

=== modified file 'reahl-doc/reahl/doc/basichtmlwidgets.py'
--- reahl-doc/reahl/doc/basichtmlwidgets.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/basichtmlwidgets.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface
 from reahl.web.ui import TwoColumnPage, Panel, P
 

=== modified file 'reahl-doc/reahl/doc/commands.py'
--- reahl-doc/reahl/doc/commands.py	2014-07-31 09:51:28 +0000
+++ reahl-doc/reahl/doc/commands.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 import os
 import shutil
 import pkg_resources

=== modified file 'reahl-doc/reahl/doc/examples/features/access/.reahlproject'
--- reahl-doc/reahl/doc/examples/features/access/.reahlproject	2013-12-05 14:13:07 +0000
+++ reahl-doc/reahl/doc/examples/features/access/.reahlproject	2014-09-04 15:41:33 +0000
@@ -3,7 +3,7 @@
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
     <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/features/access/access.py'
--- reahl-doc/reahl/doc/examples/features/access/access.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/access/access.py	2014-09-04 15:41:33 +0000
@@ -1,7 +1,6 @@
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface
 from reahl.web.ui import TwoColumnPage, Form, TextInput, Button, LabelledBlockInput
 from reahl.component.modelinterface import Action

=== modified file 'reahl-doc/reahl/doc/examples/features/access/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/features/access/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/access/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.features.access.access import AccessUI
 
 web.site_root = AccessUI

=== modified file 'reahl-doc/reahl/doc/examples/features/i18nexample/.reahlproject'
--- reahl-doc/reahl/doc/examples/features/i18nexample/.reahlproject	2013-12-05 14:13:07 +0000
+++ reahl-doc/reahl/doc/examples/features/i18nexample/.reahlproject	2014-09-04 15:41:33 +0000
@@ -2,7 +2,7 @@
   <deps purpose="run">
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
     <egg name="reahl-doc"/>
   </deps>
 

=== modified file 'reahl-doc/reahl/doc/examples/features/i18nexample/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/features/i18nexample/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/i18nexample/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.features.i18nexample.i18nexample import TranslatedUI
 
 web.site_root = TranslatedUI

=== modified file 'reahl-doc/reahl/doc/examples/features/i18nexample/i18nexample.py'
--- reahl-doc/reahl/doc/examples/features/i18nexample/i18nexample.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/i18nexample/i18nexample.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface, Url, UserInterface
 from reahl.web.ui import HMenu
 from reahl.web.ui import P

=== modified file 'reahl-doc/reahl/doc/examples/features/layout/.reahlproject'
--- reahl-doc/reahl/doc/examples/features/layout/.reahlproject	2013-12-05 14:13:07 +0000
+++ reahl-doc/reahl/doc/examples/features/layout/.reahlproject	2014-09-04 15:41:33 +0000
@@ -2,7 +2,7 @@
   <deps purpose="run">
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/features/layout/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/features/layout/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/layout/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Reahl Software Services (Pty) Ltd. All rights reserved.
+# Copyright 2013, 2014 Reahl Software Services (Pty) Ltd. All rights reserved.
 #
 #    This file is part of Reahl.
 #
@@ -15,8 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.features.layout.layout import LayoutUI
 
 web.site_root = LayoutUI

=== modified file 'reahl-doc/reahl/doc/examples/features/layout/layout.py'
--- reahl-doc/reahl/doc/examples/features/layout/layout.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/layout/layout.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface
 from reahl.web.ui import TwoColumnPage, Form, TextInput, LabelledBlockInput, P, YuiGrid, YuiUnit
 from reahl.component.modelinterface import exposed, Field, EmailField

=== modified file 'reahl-doc/reahl/doc/examples/features/pageflow/.reahlproject'
--- reahl-doc/reahl/doc/examples/features/pageflow/.reahlproject	2013-12-05 14:13:07 +0000
+++ reahl-doc/reahl/doc/examples/features/pageflow/.reahlproject	2014-09-04 15:41:33 +0000
@@ -2,7 +2,7 @@
   <deps purpose="run">
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/features/pageflow/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/features/pageflow/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/pageflow/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.features.pageflow.pageflow import PageFlowUI
 
 web.site_root = PageFlowUI

=== modified file 'reahl-doc/reahl/doc/examples/features/pageflow/pageflow.py'
--- reahl-doc/reahl/doc/examples/features/pageflow/pageflow.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/pageflow/pageflow.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface
 from reahl.web.ui import Button
 from reahl.web.ui import Form

=== modified file 'reahl-doc/reahl/doc/examples/features/persistence/.reahlproject'
--- reahl-doc/reahl/doc/examples/features/persistence/.reahlproject	2013-12-05 14:13:07 +0000
+++ reahl-doc/reahl/doc/examples/features/persistence/.reahlproject	2014-09-04 15:41:33 +0000
@@ -3,7 +3,7 @@
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
     <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/features/persistence/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/features/persistence/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/persistence/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.features.persistence.persistence import PersistenceUI
 
 web.site_root = PersistenceUI

=== modified file 'reahl-doc/reahl/doc/examples/features/persistence/persistence.py'
--- reahl-doc/reahl/doc/examples/features/persistence/persistence.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/persistence/persistence.py	2014-09-04 15:41:33 +0000
@@ -1,9 +1,8 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
-import elixir
+from __future__ import print_function, unicode_literals, absolute_import, division
 
-from reahl.sqlalchemysupport import Session, metadata
+from sqlalchemy import Column, UnicodeText, Integer
+from reahl.sqlalchemysupport import Session, Base
 
 from reahl.web.fw import UserInterface
 from reahl.web.ui import Button
@@ -28,16 +27,16 @@
 
         self.main.add_child(CommentForm(view))
 
-        for comment in Comment.query.all():
+        for comment in Session.query(Comment).all():
             self.main.add_child(CommentBox(view, comment))
 
 
-class Comment(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata, tablename='features_comment')
-    elixir.using_mapper_options(save_on_init=False)
+class Comment(Base):
+    __tablename__ = 'features_comment'
     
-    email_address = elixir.Field(elixir.UnicodeText)
-    text          = elixir.Field(elixir.UnicodeText)
+    id = Column(Integer, primary_key=True)
+    email_address = Column(UnicodeText)
+    text          = Column(UnicodeText)
     
     @exposed
     def fields(self, fields):

=== modified file 'reahl-doc/reahl/doc/examples/features/tabbedpanel/.reahlproject'
--- reahl-doc/reahl/doc/examples/features/tabbedpanel/.reahlproject	2013-12-05 14:13:07 +0000
+++ reahl-doc/reahl/doc/examples/features/tabbedpanel/.reahlproject	2014-09-04 15:41:33 +0000
@@ -2,7 +2,7 @@
   <deps purpose="run">
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/features/tabbedpanel/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/features/tabbedpanel/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/tabbedpanel/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.features.tabbedpanel.tabbedpanel import TabbedPanelUI
 
 web.site_root = TabbedPanelUI

=== modified file 'reahl-doc/reahl/doc/examples/features/tabbedpanel/tabbedpanel.py'
--- reahl-doc/reahl/doc/examples/features/tabbedpanel/tabbedpanel.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/tabbedpanel/tabbedpanel.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface
 from reahl.web.ui import TwoColumnPage, TabbedPanel, Tab, P
 

=== modified file 'reahl-doc/reahl/doc/examples/features/validation/.reahlproject'
--- reahl-doc/reahl/doc/examples/features/validation/.reahlproject	2013-12-05 14:13:07 +0000
+++ reahl-doc/reahl/doc/examples/features/validation/.reahlproject	2014-09-04 15:41:33 +0000
@@ -2,7 +2,7 @@
   <deps purpose="run">
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/features/validation/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/features/validation/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/validation/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.features.validation.validation import ValidationUI
 
 web.site_root = ValidationUI

=== modified file 'reahl-doc/reahl/doc/examples/features/validation/validation.py'
--- reahl-doc/reahl/doc/examples/features/validation/validation.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/features/validation/validation.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface
 from reahl.web.ui import TwoColumnPage, Form, TextInput
 from reahl.component.modelinterface import exposed, EmailField

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/access/.reahlproject'
--- reahl-doc/reahl/doc/examples/tutorial/access/.reahlproject	2014-04-01 11:27:49 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/access/.reahlproject	2014-09-04 15:41:33 +0000
@@ -3,7 +3,7 @@
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
     <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
     <egg name="reahl-domain"/>
   </deps>
 

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/access/access.py'
--- reahl-doc/reahl/doc/examples/tutorial/access/access.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/access/access.py	2014-09-04 15:41:33 +0000
@@ -1,29 +1,32 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
-import elixir
-
-from reahl.sqlalchemysupport import Session, metadata
+from __future__ import print_function, unicode_literals, absolute_import, division
+
+
+from sqlalchemy import Column, ForeignKey, Integer, UnicodeText, Boolean
+from sqlalchemy.orm import relationship
+
+from reahl.sqlalchemysupport import Session, Base
 
 from reahl.web.fw import UserInterface, UrlBoundView, CannotCreate
 from reahl.web.ui import TwoColumnPage, Form, TextInput, LabelledBlockInput, Button, Panel, P, H, InputGroup, HMenu,\
                          PasswordInput, ErrorFeedbackMessage, VMenu, Slot, MenuItem, A, Widget, SelectInput, CheckboxInput
-from reahl.systemaccountmodel import AccountManagementInterface, EmailAndPasswordSystemAccount, UserSession
+from reahl.domain.systemaccountmodel import AccountManagementInterface, EmailAndPasswordSystemAccount, UserSession
 from reahl.component.modelinterface import exposed, IntegerField, BooleanField, Field, EmailField, Event, Action, Choice, ChoiceField
 
 
 
-class Address(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-    elixir.using_mapper_options(save_on_init=False)
-    
-    address_book  = elixir.ManyToOne('reahl.doc.examples.tutorial.access.access.AddressBook')
-    email_address = elixir.Field(elixir.UnicodeText)
-    name          = elixir.Field(elixir.UnicodeText)
+class Address(Base):
+    __tablename__ = 'access_address'
+
+    id              = Column(Integer, primary_key=True)    
+    address_book_id = Column(Integer, ForeignKey('access_address_book.id'))
+    address_book    = relationship('reahl.doc.examples.tutorial.access.access.AddressBook')
+    email_address   = Column(UnicodeText)
+    name            = Column(UnicodeText)
 
     @classmethod
     def by_id(cls, address_id, exception_to_raise):
-        addresses = Address.query.filter_by(id=address_id)
+        addresses = Session.query(cls).filter_by(id=address_id)
         if addresses.count() != 1:
             raise exception_to_raise
         return addresses.one()
@@ -51,31 +54,36 @@
         return self.address_book.can_be_added_to_by(current_account)
 
 
-class AddressBook(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-
-    owner      = elixir.ManyToOne(EmailAndPasswordSystemAccount, required=True)
+class AddressBook(Base):
+    __tablename__ = 'access_address_book'
+
+    id              = Column(Integer, primary_key=True)
+
+    owner_id   = Column(Integer, ForeignKey(EmailAndPasswordSystemAccount.id), nullable=False)
+    owner      = relationship(EmailAndPasswordSystemAccount)
+    collaborators = relationship('reahl.doc.examples.tutorial.access.access.Collaborator', lazy='dynamic',
+                                 backref='address_book')
 
     @classmethod
     def by_id(cls, address_book_id, exception_to_raise):
-        address_books = AddressBook.query.filter_by(id=address_book_id)
+        address_books = Session.query(cls).filter_by(id=address_book_id)
         if address_books.count() != 1:
             raise exception_to_raise
         return address_books.one()
     
     @classmethod
     def owned_by(cls, account):
-        return cls.query.filter_by(owner=account)
+        return Session.query(cls).filter_by(owner=account)
         
     @classmethod
     def address_books_visible_to(cls, account):
-        visible_books = cls.query.join(Collaborator).filter(Collaborator.account == account).all()
+        visible_books = Session.query(cls).join(Collaborator).filter(Collaborator.account == account).all()
         visible_books.extend(cls.owned_by(account))
         return visible_books
 
     @exposed
     def fields(self, fields):
-        collaborators = [Choice(i.id, IntegerField(label=i.email)) for i in EmailAndPasswordSystemAccount.query.all()]
+        collaborators = [Choice(i.id, IntegerField(label=i.email)) for i in Session.query(EmailAndPasswordSystemAccount).all()]
         fields.chosen_collaborator = ChoiceField(collaborators, label='Choose collaborator')
         fields.may_edit_address = BooleanField(label='May edit existing addresses')
         fields.may_add_address = BooleanField(label='May add new addresses')
@@ -85,22 +93,21 @@
         events.add_collaborator = Event(label='Share', action=Action(self.add_collaborator))
 
     def add_collaborator(self):
-        chosen_account = EmailAndPasswordSystemAccount.query.filter_by(id=self.chosen_collaborator).one()
+        chosen_account = Session.query(EmailAndPasswordSystemAccount).filter_by(id=self.chosen_collaborator).one()
         self.allow(chosen_account, can_add_addresses=self.may_add_address, can_edit_addresses=self.may_edit_address)
 
     # See https://groups.google.com/forum/?fromgroups=#!topic/sqlelixir/ZlR9Kvcor6Q
     #    addresses  = elixir.OneToMany(Address)
     @property
     def addresses(self):
-        return Address.query.filter_by(address_book=self).all()
-    collaborators = elixir.OneToMany('reahl.doc.examples.tutorial.access.access.Collaborator', lazy='dynamic')
+        return Session.query(Address).filter_by(address_book=self).all()
 
     @property
     def display_name(self):
         return 'Address book of %s' % self.owner.email
 
     def allow(self, account, can_add_addresses=False, can_edit_addresses=False):
-        Collaborator.query.filter_by(address_book=self, account=account).delete()
+        Session.query(Collaborator).filter_by(address_book=self, account=account).delete()
         Collaborator(address_book=self, account=account,
             can_add_addresses=can_add_addresses,
             can_edit_addresses=can_edit_addresses)
@@ -147,14 +154,17 @@
         return None
 
 
-class Collaborator(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-
-    account = elixir.ManyToOne(EmailAndPasswordSystemAccount)
-    can_add_addresses = elixir.Field(elixir.Boolean, default=False)
-    can_edit_addresses = elixir.Field(elixir.Boolean, default=False)
-
-    address_book = elixir.ManyToOne(AddressBook)
+class Collaborator(Base):
+    __tablename__ = 'access_collaborator'
+    id      = Column(Integer, primary_key=True)
+
+    address_book_id = Column(Integer, ForeignKey(AddressBook.id))
+
+    account_id = Column(Integer, ForeignKey(EmailAndPasswordSystemAccount.id), nullable=False)
+    account = relationship(EmailAndPasswordSystemAccount)
+    
+    can_add_addresses = Column(Boolean, default=False)
+    can_edit_addresses = Column(Boolean, default=False)
 
 
 class AddressAppPage(TwoColumnPage):
@@ -220,7 +230,7 @@
 
 class AddressBookPanel(Panel):
     def __init__(self, view, address_book, address_book_ui):
-    	self.address_book = address_book
+        self.address_book = address_book
         super(AddressBookPanel, self).__init__(view)
         
         self.add_child(H(view, 1, text='Addresses in %s' % address_book.display_name))

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/access/access_dev/accesstests.py'
--- reahl-doc/reahl/doc/examples/tutorial/access/access_dev/accesstests.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/access/access_dev/accesstests.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.tofu import test, set_up, scenario
 
 from reahl.sqlalchemysupport import Session
@@ -11,7 +10,7 @@
 from reahl.doc.examples.tutorial.access.access import Address
 from reahl.doc.examples.tutorial.access.access import AddressBook
 from reahl.doc.examples.tutorial.access.access import AddressBookUI
-from reahl.systemaccountmodel import EmailAndPasswordSystemAccount
+from reahl.domain.systemaccountmodel import EmailAndPasswordSystemAccount
 
 
 class AccessFixture(WebFixture):
@@ -22,13 +21,16 @@
 
     def new_account(self, email='[e-mail]'):
         account = EmailAndPasswordSystemAccount(email=email)
+        Session.add(account)
         account.set_new_password(account.email, self.password)
         account.activate()
         return account
 
     def new_address_book(self, owner=None):
         owner = owner or self.account
-        return AddressBook(owner=owner)
+        address_book = AddressBook(owner=owner)
+        Session.add(address_book)
+        return address_book
 
     def new_other_account(self):
         return self.new_account(email='[e-mail]')
@@ -80,8 +82,6 @@
         Session.commit()
 
 
-
-
 @test(AccessFixture)
 def separate_address_books(fixture):
     """An Address is created in a particular AddressBook, which is owned by a SystemAccount."""

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/access/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/tutorial/access/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/access/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.tutorial.access.access import AddressBookUI
 
 web.site_root = AddressBookUI

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/access1/access1.py'
--- reahl-doc/reahl/doc/examples/tutorial/access1/access1.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/access1/access1.py	2014-09-04 15:41:33 +0000
@@ -1,38 +1,43 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
-import elixir
-
-from reahl.sqlalchemysupport import Session, metadata
-from reahl.systemaccountmodel import EmailAndPasswordSystemAccount
-
-
-class Address(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-    elixir.using_mapper_options(save_on_init=False)
-    
-    address_book  = elixir.ManyToOne('reahl.doc.examples.tutorial.access1.access1.AddressBook')
-    email_address = elixir.Field(elixir.UnicodeText)
-    name          = elixir.Field(elixir.UnicodeText)
+from __future__ import print_function, unicode_literals, absolute_import, division
+
+from sqlalchemy import Column, ForeignKey, Integer, UnicodeText, Boolean
+from sqlalchemy.orm import relationship, backref
+
+from reahl.sqlalchemysupport import Session, Base
+from reahl.domain.systemaccountmodel import EmailAndPasswordSystemAccount
+
+
+class Address(Base):
+    __tablename__ = 'access1_address'
+
+    id              = Column(Integer, primary_key=True)    
+    address_book_id = Column(Integer, ForeignKey('access1_address_book.id'))
+    address_book    = relationship('reahl.doc.examples.tutorial.access1.access1.AddressBook')
+    email_address   = Column(UnicodeText)
+    name            = Column(UnicodeText)
 
     def save(self):
         Session.add(self)
 
-        
-
-
-class AddressBook(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-
-    owner      = elixir.ManyToOne(EmailAndPasswordSystemAccount, required=True)
+
+class AddressBook(Base):
+    __tablename__ = 'access1_address_book'
+
+    id              = Column(Integer, primary_key=True)
+
+    owner_id   = Column(Integer, ForeignKey(EmailAndPasswordSystemAccount.id), nullable=False)
+    owner      = relationship(EmailAndPasswordSystemAccount)
+    collaborators = relationship('reahl.doc.examples.tutorial.access1.access1.Collaborator', lazy='dynamic',
+                                 backref='address_book')
 
     @classmethod
     def owned_by(cls, account):
-        return cls.query.filter_by(owner=account)
+        return Session.query(cls).filter_by(owner=account)
         
     @classmethod
     def address_books_visible_to(cls, account):
-        visible_books = cls.query.join(Collaborator).filter(Collaborator.account == account).all()
+        visible_books = Session.query(cls).join(Collaborator).filter(Collaborator.account == account).all()
         visible_books.extend(cls.owned_by(account))
         return visible_books
 
@@ -40,12 +45,10 @@
     #    addresses  = elixir.OneToMany(Address)
     @property
     def addresses(self):
-        return Address.query.filter_by(address_book=self).all()
-
-    collaborators = elixir.OneToMany('reahl.doc.examples.tutorial.access1.access1.Collaborator', lazy='dynamic')
+        return Session.query(Address).filter_by(address_book=self).all()
 
     def allow(self, account, can_add_addresses=False, can_edit_addresses=False):
-        Collaborator.query.filter_by(address_book=self, account=account).delete()
+        Session.query(Collaborator).filter_by(address_book=self, account=account).delete()
         Collaborator(address_book=self, account=account,
             can_add_addresses=can_add_addresses,
             can_edit_addresses=can_edit_addresses)
@@ -80,13 +83,18 @@
         return None
 
 
-class Collaborator(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-
-    account = elixir.ManyToOne(EmailAndPasswordSystemAccount)
-    can_add_addresses = elixir.Field(elixir.Boolean, default=False)
-    can_edit_addresses = elixir.Field(elixir.Boolean, default=False)
-
-    address_book = elixir.ManyToOne(AddressBook)
+class Collaborator(Base):
+    __tablename__ = 'access1_collaborator'
+    id      = Column(Integer, primary_key=True)
+
+    address_book_id = Column(Integer, ForeignKey(AddressBook.id))
+
+    account_id = Column(Integer, ForeignKey(EmailAndPasswordSystemAccount.id), nullable=False)
+    account = relationship(EmailAndPasswordSystemAccount)
+    
+    can_add_addresses = Column(Boolean, default=False)
+    can_edit_addresses = Column(Boolean, default=False)
+
+
 
 

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/access1/access1_dev/accesstests1.py'
--- reahl-doc/reahl/doc/examples/tutorial/access1/access1_dev/accesstests1.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/access1/access1_dev/accesstests1.py	2014-09-04 15:41:33 +0000
@@ -3,11 +3,12 @@
 # nosetests -F reahl.webdev.fixtures:BrowserSetup -s --nologcapture reahl/doc_dev/tutorialtests/accesstests1.py
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.tofu import test
 from reahl.web_dev.fixtures import WebFixture
-from reahl.systemaccountmodel import EmailAndPasswordSystemAccount
+from reahl.domain.systemaccountmodel import EmailAndPasswordSystemAccount
+
+from reahl.sqlalchemysupport import Session
 
 from reahl.doc.examples.tutorial.access1.access1 import AddressBook, Address
 
@@ -17,13 +18,16 @@
 
     def new_account(self, email='[e-mail]'):
         account = EmailAndPasswordSystemAccount(email=email)
+        Session.add(account)
         account.set_new_password(account.email, self.password)
         account.activate()
         return account
 
     def new_address_book(self, owner=None):
         owner = owner or self.account
-        return AddressBook(owner=owner)
+        address_book = AddressBook(owner=owner)
+        Session.add(address_book)
+        return address_book
 
     def new_other_account(self):
         return self.new_account(email='[e-mail]')

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/access2/.reahlproject'
--- reahl-doc/reahl/doc/examples/tutorial/access2/.reahlproject	2014-04-01 11:27:49 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/access2/.reahlproject	2014-09-04 15:41:33 +0000
@@ -3,7 +3,7 @@
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
     <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
     <egg name="reahl-domain"/>
   </deps>
 

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/access2/access2.py'
--- reahl-doc/reahl/doc/examples/tutorial/access2/access2.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/access2/access2.py	2014-09-04 15:41:33 +0000
@@ -1,28 +1,29 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
-import elixir
-
-from reahl.sqlalchemysupport import Session, metadata
-from reahl.systemaccountmodel import AccountManagementInterface, EmailAndPasswordSystemAccount, UserSession
+from __future__ import print_function, unicode_literals, absolute_import, division
+
+from sqlalchemy import Column, ForeignKey, Integer, UnicodeText, Boolean
+from sqlalchemy.orm import relationship
+
+from reahl.sqlalchemysupport import Session, Base
+from reahl.domain.systemaccountmodel import AccountManagementInterface, EmailAndPasswordSystemAccount, UserSession
 from reahl.component.modelinterface import exposed, IntegerField, BooleanField, Field, EmailField, Event, Action, Choice, ChoiceField
 from reahl.web.fw import UserInterface, UrlBoundView, CannotCreate
 from reahl.web.ui import TwoColumnPage, Form, TextInput, LabelledBlockInput, Button, Panel, A, P, H, InputGroup, HMenu,\
                          PasswordInput, ErrorFeedbackMessage, Slot, Widget, SelectInput, CheckboxInput
 
 
+class Address(Base):
+    __tablename__ = 'access2_address'
 
-class Address(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-    elixir.using_mapper_options(save_on_init=False)
-    
-    address_book  = elixir.ManyToOne('reahl.doc.examples.tutorial.access2.access2.AddressBook')
-    email_address = elixir.Field(elixir.UnicodeText)
-    name          = elixir.Field(elixir.UnicodeText)
+    id              = Column(Integer, primary_key=True)    
+    address_book_id = Column(Integer, ForeignKey('access2_address_book.id'))
+    address_book    = relationship('reahl.doc.examples.tutorial.access2.access2.AddressBook')
+    email_address   = Column(UnicodeText)
+    name            = Column(UnicodeText)
 
     @classmethod
     def by_id(cls, address_id, exception_to_raise):
-        addresses = Address.query.filter_by(id=address_id)
+        addresses = Session.query(cls).filter_by(id=address_id)
         if addresses.count() != 1:
             raise exception_to_raise
         return addresses.one()
@@ -42,31 +43,36 @@
         Session.add(self)
 
 
-class AddressBook(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-
-    owner      = elixir.ManyToOne(EmailAndPasswordSystemAccount, required=True)
+class AddressBook(Base):
+    __tablename__ = 'access2_address_book'
+
+    id              = Column(Integer, primary_key=True)
+
+    owner_id   = Column(Integer, ForeignKey(EmailAndPasswordSystemAccount.id), nullable=False)
+    owner      = relationship(EmailAndPasswordSystemAccount)
+    collaborators = relationship('reahl.doc.examples.tutorial.access2.access2.Collaborator', lazy='dynamic',
+                                 backref='address_book')
 
     @classmethod
     def by_id(cls, address_book_id, exception_to_raise):
-        address_books = AddressBook.query.filter_by(id=address_book_id)
+        address_books = Session.query(cls).filter_by(id=address_book_id)
         if address_books.count() != 1:
             raise exception_to_raise
         return address_books.one()
     
     @classmethod
     def owned_by(cls, account):
-        return cls.query.filter_by(owner=account)
+        return Session.query(cls).filter_by(owner=account)
         
     @classmethod
     def address_books_visible_to(cls, account):
-        visible_books = cls.query.join(Collaborator).filter(Collaborator.account == account).all()
+        visible_books = Session.query(cls).join(Collaborator).filter(Collaborator.account == account).all()
         visible_books.extend(cls.owned_by(account))
         return visible_books
 
     @exposed
     def fields(self, fields):
-        collaborators = [Choice(i.id, IntegerField(label=i.email)) for i in EmailAndPasswordSystemAccount.query.all()]
+        collaborators = [Choice(i.id, IntegerField(label=i.email)) for i in Session.query(EmailAndPasswordSystemAccount).all()]
         fields.chosen_collaborator = ChoiceField(collaborators, label='Choose collaborator')
         fields.may_edit_address = BooleanField(label='May edit existing addresses')
         fields.may_add_address = BooleanField(label='May add new addresses')
@@ -76,23 +82,21 @@
         events.add_collaborator = Event(label='Share', action=Action(self.add_collaborator))
 
     def add_collaborator(self):
-        chosen_account = EmailAndPasswordSystemAccount.query.filter_by(id=self.chosen_collaborator).one()
+        chosen_account = Session.query(EmailAndPasswordSystemAccount).filter_by(id=self.chosen_collaborator).one()
         self.allow(chosen_account, can_add_addresses=self.may_add_address, can_edit_addresses=self.may_edit_address)
 
     # See https://groups.google.com/forum/?fromgroups=#!topic/sqlelixir/ZlR9Kvcor6Q
     #    addresses  = elixir.OneToMany(Address)
     @property
     def addresses(self):
-        return Address.query.filter_by(address_book=self).all()
-
-    collaborators = elixir.OneToMany('reahl.doc.examples.tutorial.access2.access2.Collaborator', lazy='dynamic')
+        return Session.query(Address).filter_by(address_book=self).all()
 
     @property
     def display_name(self):
         return 'Address book of %s' % self.owner.email
 
     def allow(self, account, can_add_addresses=False, can_edit_addresses=False):
-        Collaborator.query.filter_by(address_book=self, account=account).delete()
+        Session.query(Collaborator).filter_by(address_book=self, account=account).delete()
         Collaborator(address_book=self, account=account,
             can_add_addresses=can_add_addresses,
             can_edit_addresses=can_edit_addresses)
@@ -127,14 +131,17 @@
         return None
 
 
-class Collaborator(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-
-    account = elixir.ManyToOne(EmailAndPasswordSystemAccount)
-    can_add_addresses = elixir.Field(elixir.Boolean, default=False)
-    can_edit_addresses = elixir.Field(elixir.Boolean, default=False)
-
-    address_book = elixir.ManyToOne(AddressBook)
+class Collaborator(Base):
+    __tablename__ = 'access2_collaborator'
+    id      = Column(Integer, primary_key=True)
+
+    address_book_id = Column(Integer, ForeignKey(AddressBook.id))
+
+    account_id = Column(Integer, ForeignKey(EmailAndPasswordSystemAccount.id), nullable=False)
+    account = relationship(EmailAndPasswordSystemAccount)
+    
+    can_add_addresses = Column(Boolean, default=False)
+    can_edit_addresses = Column(Boolean, default=False)
 
 
 class AddressAppPage(TwoColumnPage):
@@ -200,7 +207,7 @@
 
 class AddressBookPanel(Panel):
     def __init__(self, view, address_book, address_book_ui):
-    	self.address_book = address_book
+        self.address_book = address_book
         super(AddressBookPanel, self).__init__(view)
         
         self.add_child(H(view, 1, text='Addresses in %s' % address_book.display_name))

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/access2/access2_dev/accesstests2.py'
--- reahl-doc/reahl/doc/examples/tutorial/access2/access2_dev/accesstests2.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/access2/access2_dev/accesstests2.py	2014-09-04 15:41:33 +0000
@@ -7,13 +7,12 @@
 
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.tofu import test, set_up
 from reahl.web_dev.fixtures import WebFixture
 from reahl.webdev.tools import Browser, XPath
 from reahl.sqlalchemysupport import Session
-from reahl.systemaccountmodel import EmailAndPasswordSystemAccount
+from reahl.domain.systemaccountmodel import EmailAndPasswordSystemAccount
 
 from reahl.doc.examples.tutorial.access2.access2 import AddressBookUI, AddressBook, Address
 
@@ -26,13 +25,16 @@
 
     def new_account(self, email='[e-mail]'):
         account = EmailAndPasswordSystemAccount(email=email)
+        Session.add(account)
         account.set_new_password(account.email, self.password)
         account.activate()
         return account
 
     def new_address_book(self, owner=None):
         owner = owner or self.account
-        return AddressBook(owner=owner)
+        address_book = AddressBook(owner=owner)
+        Session.add(address_book)
+        return address_book
 
     def new_other_account(self):
         return self.new_account(email='[e-mail]')

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/access2/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/tutorial/access2/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/access2/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from access2 import AddressBookUI
 
 web.site_root=AddressBookUI

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/addressbook1/.reahlproject'
--- reahl-doc/reahl/doc/examples/tutorial/addressbook1/.reahlproject	2014-06-29 16:29:48 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/addressbook1/.reahlproject	2014-09-04 15:41:33 +0000
@@ -3,7 +3,7 @@
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
     <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/addressbook1/addressbook1.py'
--- reahl-doc/reahl/doc/examples/tutorial/addressbook1/addressbook1.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/addressbook1/addressbook1.py	2014-09-04 15:41:33 +0000
@@ -1,8 +1,8 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface, Widget
 from reahl.web.ui import TwoColumnPage, Panel, P, H
+from reahl.sqlalchemysupport import Session
 
 
 class AddressBookUI(UserInterface):
@@ -22,7 +22,7 @@
 
         self.add_child(H(view, 1, text='Addresses'))
 
-        for address in Address.query.all():
+        for address in Session.query(Address).all():
             self.add_child(AddressBox(view, address))
 
 
@@ -33,15 +33,15 @@
 
 
 # The model from before:
-import elixir
-from reahl.sqlalchemysupport import Session, metadata
-
-class Address(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-    elixir.using_mapper_options(save_on_init=False)
-
-    email_address = elixir.Field(elixir.UnicodeText)
-    name          = elixir.Field(elixir.UnicodeText)
+from sqlalchemy import Column, Integer, UnicodeText
+from reahl.sqlalchemysupport import Session, Base
+
+class Address(Base):
+    __tablename__ = 'addressbook1_address'
+
+    id            = Column(Integer, primary_key=True)
+    email_address = Column(UnicodeText)
+    name          = Column(UnicodeText)
 
     def save(self):
         Session.add(self)

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/addressbook1/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/tutorial/addressbook1/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/addressbook1/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.tutorial.addressbook1.addressbook1 import AddressBookUI
 
 web.site_root = AddressBookUI

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/addressbook2/.reahlproject'
--- reahl-doc/reahl/doc/examples/tutorial/addressbook2/.reahlproject	2014-04-01 11:27:49 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/addressbook2/.reahlproject	2014-09-04 15:41:33 +0000
@@ -3,7 +3,7 @@
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
     <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/addressbook2/addressbook2.py'
--- reahl-doc/reahl/doc/examples/tutorial/addressbook2/addressbook2.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/addressbook2/addressbook2.py	2014-09-04 15:41:33 +0000
@@ -1,10 +1,9 @@
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
-import elixir
+from __future__ import print_function, unicode_literals, absolute_import, division
 
-from reahl.sqlalchemysupport import Session, metadata
+from sqlalchemy import Column, Integer, UnicodeText
+from reahl.sqlalchemysupport import Session, Base
 
 from reahl.web.fw import UserInterface, Widget
 from reahl.web.ui import TwoColumnPage, Form, TextInput, LabelledBlockInput, Button, Panel, P, H, InputGroup
@@ -28,7 +27,7 @@
 
         self.add_child(H(view, 1, text='Addresses'))
         
-        for address in Address.query.all():
+        for address in Session.query(Address).all():
             self.add_child(AddressBox(view, address))
 
         self.add_child(AddAddressForm(view))
@@ -54,12 +53,12 @@
         self.add_child(P(view, text='%s: %s' % (address.name, address.email_address)))
 
 
-class Address(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata)
-    elixir.using_mapper_options(save_on_init=False)
-    
-    email_address = elixir.Field(elixir.UnicodeText)
-    name          = elixir.Field(elixir.UnicodeText)
+class Address(Base):
+    __tablename__ = 'addressbook2_address'
+
+    id            = Column(Integer, primary_key=True)
+    email_address = Column(UnicodeText)
+    name          = Column(UnicodeText)
 
     @exposed
     def fields(self, fields):

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/addressbook2/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/tutorial/addressbook2/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/addressbook2/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,7 +1,6 @@
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.tutorial.addressbook2.addressbook2 import AddressBookUI
 
 web.site_root = AddressBookUI

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/ajax/.reahlproject'
--- reahl-doc/reahl/doc/examples/tutorial/ajax/.reahlproject	2014-04-01 11:27:49 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/ajax/.reahlproject	2014-09-04 15:41:33 +0000
@@ -3,7 +3,7 @@
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
     <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/ajax/ajax.py'
--- reahl-doc/reahl/doc/examples/tutorial/ajax/ajax.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/ajax/ajax.py	2014-09-04 15:41:33 +0000
@@ -1,8 +1,7 @@
 
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.web.fw import UserInterface, Bookmark
 from reahl.web.ui import TwoColumnPage, P, H, Panel, HMenu
 from reahl.component.modelinterface import exposed, IntegerField

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/ajax/ajax_dev/ajaxtests.py'
--- reahl-doc/reahl/doc/examples/tutorial/ajax/ajax_dev/ajaxtests.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/ajax/ajax_dev/ajaxtests.py	2014-09-04 15:41:33 +0000
@@ -5,8 +5,7 @@
 
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.tofu import test
 from reahl.web_dev.fixtures import WebFixture
 from reahl.webdev.tools import XPath

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/ajax/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/tutorial/ajax/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/ajax/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,7 +1,6 @@
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.tutorial.ajax.ajax import WidgetRefreshUI
 
 web.site_root = WidgetRefreshUI 

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/componentconfig/.reahlproject'
--- reahl-doc/reahl/doc/examples/tutorial/componentconfig/.reahlproject	2014-04-01 11:27:49 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/componentconfig/.reahlproject	2014-09-04 15:41:33 +0000
@@ -3,7 +3,7 @@
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
     <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/componentconfig/componentconfig.py'
--- reahl-doc/reahl/doc/examples/tutorial/componentconfig/componentconfig.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/componentconfig/componentconfig.py	2014-09-04 15:41:33 +0000
@@ -1,10 +1,10 @@
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
-import elixir
-
-from reahl.sqlalchemysupport import Session, metadata
+from __future__ import print_function, unicode_literals, absolute_import, division
+
+from sqlalchemy import Column, Integer, UnicodeText
+
+from reahl.sqlalchemysupport import Session, Base
 
 from reahl.web.fw import UserInterface, Widget
 from reahl.web.ui import TwoColumnPage, Form, TextInput, LabelledBlockInput, Button, Panel, P, H, InputGroup
@@ -35,7 +35,7 @@
         if config.componentconfig.showheader:
             self.add_child(H(view, 1, text='Addresses'))
         
-        for address in Address.query.all():
+        for address in Session.query(Address).all():
             self.add_child(AddressBox(view, address))
 
         self.add_child(AddAddressForm(view))
@@ -61,12 +61,12 @@
         self.add_child(P(view, text='%s: %s' % (address.name, address.email_address)))
 
 
-class Address(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata, tablename='tutorial_componentconfig_address')
-    elixir.using_mapper_options(save_on_init=False)
+class Address(Base):
+    __tablename__ = 'tutorial_componentconfig_address'
     
-    email_address = elixir.Field(elixir.UnicodeText)
-    name          = elixir.Field(elixir.UnicodeText)
+    id            = Column(Integer, primary_key=True)
+    email_address = Column(UnicodeText)
+    name          = Column(UnicodeText)
 
     @exposed
     def fields(self, fields):

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/componentconfig/componentconfig_dev/componentconfigtests.py'
--- reahl-doc/reahl/doc/examples/tutorial/componentconfig/componentconfig_dev/componentconfigtests.py	2014-08-12 12:12:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/componentconfig/componentconfig_dev/componentconfigtests.py	2014-09-04 15:41:33 +0000
@@ -1,6 +1,5 @@
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 
 
 from reahl.tofu import test

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/componentconfig/etc/componentconfig.config.py'
--- reahl-doc/reahl/doc/examples/tutorial/componentconfig/etc/componentconfig.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/componentconfig/etc/componentconfig.config.py	2014-09-04 15:41:33 +0000
@@ -1,3 +1,2 @@
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 componentconfig.showheader = True

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/componentconfig/etc/web.config.py'
--- reahl-doc/reahl/doc/examples/tutorial/componentconfig/etc/web.config.py	2014-07-06 10:25:15 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/componentconfig/etc/web.config.py	2014-09-04 15:41:33 +0000
@@ -1,7 +1,6 @@
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.doc.examples.tutorial.componentconfig.componentconfig import AddressBookUI
 
 web.site_root = AddressBookUI

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/datatable/.reahlproject'
--- reahl-doc/reahl/doc/examples/tutorial/datatable/.reahlproject	2014-08-07 11:28:56 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/datatable/.reahlproject	2014-09-04 15:41:33 +0000
@@ -3,7 +3,7 @@
     <egg name="reahl-web"/>
     <egg name="reahl-component"/>
     <egg name="reahl-sqlalchemysupport"/>
-    <egg name="reahl-web-elixirimpl"/>
+    <egg name="reahl-web-declarative"/>
   </deps>
 
   <deps purpose="test">

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/datatable/datatable.py'
--- reahl-doc/reahl/doc/examples/tutorial/datatable/datatable.py	2014-08-07 11:28:56 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/datatable/datatable.py	2014-09-04 15:41:33 +0000
@@ -1,15 +1,15 @@
 
 
-from __future__ import unicode_literals
-from __future__ import print_function
-import elixir
+from __future__ import print_function, unicode_literals, absolute_import, division
+
+from sqlalchemy import Column, Integer, UnicodeText
 from sqlalchemy.orm.exc import NoResultFound
 
-from reahl.sqlalchemysupport import Session, metadata
+from reahl.sqlalchemysupport import Session, Base
 
 from reahl.web.fw import CannotCreate, UrlBoundView, UserInterface
-from reahl.web.ui import Button, Form, H, HMenu, InputGroup, LabelledBlockInput, A, CheckboxInput
 from reahl.web.ui import Panel, P, TextInput, TwoColumnPage, StaticColumn, DynamicColumn
+from reahl.web.ui import Button, Form, H, HMenu, InputGroup, LabelledBlockInput, A
 from reahl.web.table import DataTable
 from reahl.component.modelinterface import exposed, EmailField, Field, Event, IntegerField, Action, BooleanField
 
@@ -24,7 +24,7 @@
 class EditView(UrlBoundView):
     def assemble(self, address_id=None):
         try:
-            address = Address.query.filter_by(id=address_id).one()
+            address = Session.query(Address).filter_by(id=address_id).one()
         except NoResultFound:
             raise CannotCreate()
 
@@ -90,7 +90,7 @@
         self.add_child(data_table)
 
     def initialise_rows(self):
-        return [Row(address) for address in Address.query.all()]
+        return [Row(address) for address in Session.query(Address).all()]
 
 
 class EditAddressForm(Form):
@@ -127,13 +127,13 @@
         par.add_child(Button(self, address.events.edit.with_arguments(address_id=address.id)))
 
 
-class Address(elixir.Entity):
-    elixir.using_options(session=Session, metadata=metadata, tablename='tutorial_datatable_address')
-    elixir.using_mapper_options(save_on_init=False)
-    
-    email_address = elixir.Field(elixir.UnicodeText)
-    name          = elixir.Field(elixir.UnicodeText)
-    zip_code      = elixir.Field(elixir.Integer)
+class Address(Base):
+    __tablename__ = 'datatable_address'
+
+    id            = Column(Integer, primary_key=True)
+    email_address = Column(UnicodeText)
+    name          = Column(UnicodeText)
+    zip_code      = Column(Integer)
 
     @exposed
     def fields(self, fields):
@@ -148,5 +148,3 @@
 
     def save(self):
         Session.add(self)
-
-

=== modified file 'reahl-doc/reahl/doc/examples/tutorial/datatable/datatable_dev/datatabletests.py'
--- reahl-doc/reahl/doc/examples/tutorial/datatable/datatable_dev/datatabletests.py	2014-08-12 12:12:48 +0000
+++ reahl-doc/reahl/doc/examples/tutorial/datatable/datatable_dev/datatabletests.py	2014-09-04 15:41:33 +0000
@@ -1,5 +1,4 @@
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import print_function, unicode_literals, absolute_import, division
 from reahl.tofu import test
 
 from reahl.web_dev.fixtures import WebFixture
@@ -15,7 +14,7 @@
         return Browser(self.new_wsgi_app(site_root=AddressBookUI))
 
     def new_addresses(self):