[Python-modules-commits] r27983 - in packages/elixir/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Saturday, March 1, 2014 @ 23:43:12
  Author: piotr
Revision: 27983

Add sa_0.9_compatibility.patch (closes: 739476)

Added:
  packages/elixir/trunk/debian/patches/
  packages/elixir/trunk/debian/patches/sa_0.9_compatibility.patch
  packages/elixir/trunk/debian/patches/series
Modified:
  packages/elixir/trunk/debian/changelog

Modified: packages/elixir/trunk/debian/changelog
===================================================================
--- packages/elixir/trunk/debian/changelog	2014-03-01 20:11:52 UTC (rev 27982)
+++ packages/elixir/trunk/debian/changelog	2014-03-01 23:43:12 UTC (rev 27983)
@@ -1,9 +1,13 @@
-elixir (0.7.1-2) UNRELEASED; urgency=low
+elixir (0.7.1-2) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:00:48 +0200
+  [ Piotr Ożarowski ]
+  * Add sa_0.9_compatibility.patch (closes: 739476)
 
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 02 Mar 2014 00:39:08 +0100
+
 elixir (0.7.1-1) unstable; urgency=low
 
   * New upstream release

Added: packages/elixir/trunk/debian/patches/sa_0.9_compatibility.patch
===================================================================
--- packages/elixir/trunk/debian/patches/sa_0.9_compatibility.patch	                        (rev 0)
+++ packages/elixir/trunk/debian/patches/sa_0.9_compatibility.patch	2014-03-01 23:43:12 UTC (rev 27983)
@@ -0,0 +1,42 @@
+Index: elixir-0.7.1/elixir/entity.py
+===================================================================
+--- elixir-0.7.1.orig/elixir/entity.py
++++ elixir-0.7.1/elixir/entity.py
+@@ -15,7 +15,7 @@ import sqlalchemy
+ from sqlalchemy import Table, Column, Integer, desc, ForeignKey, and_, \
+                        ForeignKeyConstraint
+ from sqlalchemy.orm import MapperExtension, mapper, object_session, \
+-                           EXT_CONTINUE, polymorphic_union, ScopedSession, \
++                           EXT_CONTINUE, polymorphic_union, scoped_session, \
+                            ColumnProperty
+ from sqlalchemy.sql import ColumnCollection
+ 
+@@ -452,13 +452,13 @@ class EntityDescriptor(object):
+         # do the mapping
+         if self.session is None:
+             self.entity.mapper = mapper(self.entity, *args, **kwargs)
+-        elif isinstance(self.session, ScopedSession):
++        elif isinstance(self.session, scoped_session):
+             session_mapper = session_mapper_factory(self.session)
+             self.entity.mapper = session_mapper(self.entity, *args, **kwargs)
+         else:
+             raise Exception("Failed to map entity '%s' with its table or "
+                             "selectable. You can only bind an Entity to a "
+-                            "ScopedSession object or None for manual session "
++                            "scoped_session object or None for manual session "
+                             "management."
+                             % self.entity.__name__)
+ 
+Index: elixir-0.7.1/elixir/options.py
+===================================================================
+--- elixir-0.7.1.orig/elixir/options.py
++++ elixir-0.7.1/elixir/options.py
+@@ -116,7 +116,7 @@ The list of supported arguments are as f
+ | ``session``         | Specify a custom contextual session for this entity.  |
+ |                     | By default, entities uses the global                  |
+ |                     | ``elixir.session``.                                   |
+-|                     | This option takes a ``ScopedSession`` object or       |
++|                     | This option takes a ``scoped_session`` object or       |
+ |                     | ``None``. In the later case your entity will be       |
+ |                     | mapped using a non-contextual mapper which requires   |
+ |                     | manual session management, as seen in pure SQLAlchemy.|

Added: packages/elixir/trunk/debian/patches/series
===================================================================
--- packages/elixir/trunk/debian/patches/series	                        (rev 0)
+++ packages/elixir/trunk/debian/patches/series	2014-03-01 23:43:12 UTC (rev 27983)
@@ -0,0 +1 @@
+sa_0.9_compatibility.patch