From b14d0ba100e2f7cca4ba7e3dfa071f8fa64a9dc7 Mon Sep 17 00:00:00 2001 From: Jessica Lucci Date: Mon, 20 May 2013 09:51:02 -0500 Subject: [PATCH] Spelling errors and stuff --- .setup.py.swp | Bin 12288 -> 0 bytes taskflow/db/__init__.py | 2 +- taskflow/db/sqlalchemy/.session.py.swp | Bin 12288 -> 12288 bytes taskflow/db/sqlalchemy/session.py | 10 ++++++---- 4 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 .setup.py.swp diff --git a/.setup.py.swp b/.setup.py.swp deleted file mode 100644 index 882520c34c73a5e01b35b523de823df01e4aaf3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2zi%8x6vrnK6%YvU54<>1_AJ?ZXFGxDqLX3>KZ5Ky=mH9|ENgCe?sn|GnPq17 zj%%QzqN0O_ii(mpe*y^w5-rrwQy@|BoxNS(IRqE!B4(toW_R|zH*Y@kcBRwJp!3n~ zU3w$lVrUl`docRugYS;+Jooo|j2#JUuWoHz_m9qMyPeHz8*jhA{qDzSSuyrm6R>?t zC*@cuXWRF(?)^t<8;&cfY)HiC%m4!>5T9 zd;)<$AP@)y0)apv5C{YUfk5CHCE$v4>~rLPzRtf@_vaq#>)X%;0)apv5C{YUfj}S- z2m}IwKp+qZ1OkD;Gf04^_}l+^#vVfc|NrLq{~s?i_B-?&^ay$g{RsU4eF@E=`_N5@ zpg&(?>=)=;=nE);_Mkh^E_4IB0=)wLb%C*;p|7B~AO<~nk+Eaw8gvo*^##VhhrWgs z)Pc@JKh?QD^7)1q2m}IwKp+qZ1OkCTAn?B?u*#@z(OsiQhL6WmjcA9fQOQSwx?Q?E zbD38DYBPR4TBC!th0k6g40qn6KeJAZEBn3v?fd>>N2>DEXvum|MDnJ-itElif+3-olaw2 zV5N>H$FVk}cAXqALDC$GF_*ADFoi7O5Gj=568#Qzyja4Yi}l_~``$5qM)xmcq(jt?l4qYTgZ1UdU* zicWU_bW#adG!Rr;Oz1QXN|~p$58&l^9?pnd&adVna;-*(sj!KWg_BzKqI;+Shr`W& z6_m??;b!KSH<2)-M58W-rAoXp&!wA@%ebo(IvuD9vIGGObHbxQSywewPtah==M~qB z&Mw9I9`+(szUuo8uBlFdu3AJV?!+7QpyFfEi<%{2usX5rw9ai@UHYGn9;3lYZllo6 zYqT2kgr_h*pVP z$`(^SY0=17X-C?|-Y=GRD05N8r~@}Nkl+46m9;m-UE^}3rD{bLV|=Uz+yYiAhQPS| l+E?RU(3j&v8%K+cX-2fgiQh}@(wg=_smv(!T%z diff --git a/taskflow/db/__init__.py b/taskflow/db/__init__.py index f4174e5c..275e7e13 100644 --- a/taskflow/db/__init__.py +++ b/taskflow/db/__init__.py @@ -1,4 +1,4 @@ -i# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- # vim: tabstop=4 shiftwidth=4 softtabstop=4 diff --git a/taskflow/db/sqlalchemy/.session.py.swp b/taskflow/db/sqlalchemy/.session.py.swp index 1c8e418d4ad6129ef6af1b8294b01e3f2a889201..f1e9fad579c1413c78c3b98db80077cc3b4affc9 100644 GIT binary patch delta 590 zcmZwD%}Z2a6vy#1Z`PQi<6=k&e5&gRB115S3(419guRKP(Po?(@7xCN%pLEHBf1%1 z{)8JXq@b0%7T2LxL536rx>IZEM%(p*C=w!mr4}wa@PX&ycb>z;nV*=S2q$li-Fu)q zqcNfCMfPql4}W>-hX2%gj7q5fpssevE8_G2O${fc;^p-kkvDjb8R+Om4;pb5M^{7+ zv5#-~iXFT{36n_SJ_7h%E%FOLv5FD~(2qU{j)NkfgHo1v9NuCD22yy6Hk@7-`Gh6( zA%^QvXhto*UlQ5EdzctSGyK@C;-lEc3g$42E(GAOdO{dr06t<3A5ca&s;aO(x@s zd?q?Ftei($_`Ipoq22I$63%#}zv5|i16ta)vZ^p;Cd||`Jv$rCTb8LZ*}P>J)x&Ai pe9YZ(+nWY2^ki~H-A*S`dO`kmUI_J^k;&=*2`oD+mG$;JzB9q9fU^Jq delta 478 zcmXZY&nv?L7{~Evv-v%r;)c+z4ga# zQVmD*m)#aMi`XoGQ&n>)3x$hD5gkW3L=0<~#TZ5rgdOhlS@V}%hx}!=!nGffuBcaLo##-n<_jE-?q2jAbM>3yHC$y5Q+t_uLt&Vsy UwVBB&WJ`&an3~KRH$8!>U!@CO7ytkO diff --git a/taskflow/db/sqlalchemy/session.py b/taskflow/db/sqlalchemy/session.py index 35e71a8c..c0720e0e 100644 --- a/taskflow/db/sqlalchemy/session.py +++ b/taskflow/db/sqlalchemy/session.py @@ -20,7 +20,12 @@ """Session Handling for SQLAlchemy backend.""" import logging + +import sqlalchemy.orm +import sqlalchemy.engine +import sqlalchemy.interfaces import sqlalchemy +from sqlalchemy.pool import NullPool from taskflow.db import api as db_api @@ -76,10 +81,7 @@ def get_engine(): if "sqlite" in connection_dict.drivername: engine_args['poolclass'] = NullPool - if "mysql" in connection_dict.drivername: - engine_args['listeners'] = [MySQLPingListener()] - - _ENGINE = sqlqlchemy.create_engine(_get_sql_connection(), + _ENGINE = sqlalchemy.create_engine(_get_sql_connection(), **engine_args) #TODO: Check to make sure engine connected