# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1544189274 -3600
# Node ID 2be615fc6da4963c24519fca47f6a549af627c6d
# Parent  4b8d1079828218e1055e3ce57a2b7443ff518968# Parent  2265a1c6cbd1db081b8ce54ceaf1d624292ff0da
Rebase after corruption

diff -r 2265a1c6cbd1 -r 2be615fc6da4 .hgtags
--- a/.hgtags	Wed Dec 05 16:36:25 2018 +0100
+++ b/.hgtags	Fri Dec 07 14:27:54 2018 +0100
@@ -1,29 +1,10 @@
-00db38a07bb345bfccae2210123d3676195ca054 0.1.0
-8ee5e8dfd4da44fcf4881e96d26a1bcee0112dd1 0.1.1
-7ca0455fcded3d176d1d2ad37c58def90a82532c 0.1.2
-3695b338fe3d9cfcc20d918f4e40f6da9932a2b9 0.1.3
-960cfacb72497a8a63c4ce8eb197abddcd3a2141 0.1.4
-3093606fa69511c9483ba0681d48657d78ee8498 0.1.5
-b06631af55a5a8f2178502ea5e2c5335c4fd2b8c 0.1.6
-29149bd0b72a80d89d021481b2c1770758d45c46 0.1.7
-2d2d5040fee051f2896948a146bbff6e7a906533 0.1.8
-40f12a3d67db0dfd7c610140c70908c9949ed9f6 0.1.9
 6239080e27fd6d83a907074c4846902051bec7bd 0.1.0
-0000000000000000000000000000000000000000 0.1.1
 3245d21bda40cef686929558869c3dc1c5f843f4 0.1.1
-0000000000000000000000000000000000000000 0.1.2
 d56eef10d01a895a14c063c05e726f18cfdf7e51 0.1.2
-0000000000000000000000000000000000000000 0.1.3
 296bbb469ca44d6c0c35968742d097df6fc5b72d 0.1.3
-0000000000000000000000000000000000000000 0.1.4
 2217a4d1dde9cadf0b8f416bdfb233c18f12ba58 0.1.4
-0000000000000000000000000000000000000000 0.1.5
 7b2902f6f8496c980b9336bc31ae73ccb6dba86e 0.1.5
-0000000000000000000000000000000000000000 0.1.6
 65e7ee10fc207046c0a6432ee439ec4695fbbe30 0.1.6
-0000000000000000000000000000000000000000 0.1.7
 9b87ac9dff97eb0d805f3d131b542262cf2dc9f5 0.1.7
-0000000000000000000000000000000000000000 0.1.8
 2399139252a9f5d65ca837a8795ffa70031ab2aa 0.1.8
-40f12a3d67db0dfd7c610140c70908c9949ed9f6 0.1.9
-40f12a3d67db0dfd7c610140c70908c9949ed9f6 0.1.9
+e8c93d4d047913b207df99be1ff327f1a274b466 0.1.9
diff -r 2265a1c6cbd1 -r 2be615fc6da4 buildout.cfg
diff -r 2265a1c6cbd1 -r 2be615fc6da4 docs/HISTORY.txt
diff -r 2265a1c6cbd1 -r 2be615fc6da4 setup.py
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy.egg-info/PKG-INFO
--- a/src/pyams_alchemy.egg-info/PKG-INFO	Wed Dec 05 16:36:25 2018 +0100
+++ b/src/pyams_alchemy.egg-info/PKG-INFO	Fri Dec 07 14:27:54 2018 +0100
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 1.1
 Name: pyams-alchemy
 Version: 0.1.9
 Summary: PyAMS interfaces and classes for SQLAlchemy integration
@@ -6,6 +6,7 @@
 Author: Thierry Florac
 Author-email: tflorac@ulthar.net
 License: ZPL
+Description-Content-Type: UNKNOWN
 Description: 
         
         History
@@ -73,4 +74,3 @@
 Classifier: Programming Language :: Python
 Classifier: Framework :: Pyramid
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Provides-Extra: test
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy.egg-info/SOURCES.txt
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy.egg-info/requires.txt
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/__init__.py
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/configure.zcml
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/engine.py
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/interfaces/__init__.py
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/loader.py
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/locales/fr/LC_MESSAGES/pyams_alchemy.mo
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/locales/fr/LC_MESSAGES/pyams_alchemy.po
--- a/src/pyams_alchemy/locales/fr/LC_MESSAGES/pyams_alchemy.po	Wed Dec 05 16:36:25 2018 +0100
+++ b/src/pyams_alchemy/locales/fr/LC_MESSAGES/pyams_alchemy.po	Fri Dec 07 14:27:54 2018 +0100
@@ -67,8 +67,8 @@
 #: src/pyams_alchemy/interfaces/__init__.py:59
 msgid "SQLAlchemy connection recycle time (-1 for none)"
 msgstr ""
-"Durée de vie (en secondes) des connexions avant leur recyclage ; indiquer -1 pour "
-"conserver les connexions"
+"Durée de vie (en secondes) des connexions avant leur recyclage ; indiquer -1 "
+"pour conserver les connexions"
 
 #: src/pyams_alchemy/metadirectives.py:58
 #: src/pyams_alchemy/interfaces/__init__.py:63
@@ -78,7 +78,9 @@
 #: src/pyams_alchemy/metadirectives.py:59
 #: src/pyams_alchemy/interfaces/__init__.py:64
 msgid "Log all pool checkouts/checkins to system logger?"
-msgstr "Tracer toutes les entrées/sorties du pool de connexions dans le système de logs de l'application"
+msgstr ""
+"Tracer toutes les entrées/sorties du pool de connexions dans le système de "
+"logs de l'application"
 
 #: src/pyams_alchemy/metadirectives.py:63
 #: src/pyams_alchemy/interfaces/__init__.py:68
@@ -157,4 +159,5 @@
 
 #: src/pyams_alchemy/interfaces/__init__.py:44
 msgid "Log all SQL statements to system logger"
-msgstr "Tracer toutes les instructions SQL dans le système de logs de l'application"
+msgstr ""
+"Tracer toutes les instructions SQL dans le système de logs de l'application"
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/locales/pyams_alchemy.pot
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/metaconfigure.py
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/metadirectives.py
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/mixin.py
diff -r 2265a1c6cbd1 -r 2be615fc6da4 src/pyams_alchemy/zmi/engine.py