Oops, checked in the wrong file

This commit is contained in:
rdb 2013-12-17 20:04:59 +00:00
parent 88048bf3da
commit 66f4964c8b
2 changed files with 9 additions and 9 deletions

View File

@ -13,10 +13,7 @@ class DirectMySQLdbConnection(Connection):
kwargs2 = kwargs.copy() kwargs2 = kwargs.copy()
if kwargs.has_key('conv'): conv = kwargs.get('conv', conversions)
conv = kwargs['conv']
else:
conv = conversions
kwargs2['conv'] = dict([ (k, v) for k, v in conv.items() kwargs2['conv'] = dict([ (k, v) for k, v in conv.items()
if type(k) is int ]) if type(k) is int ])

View File

@ -61,7 +61,10 @@ import bisect
__report_indent = 3 __report_indent = 3
from direct.directutil import Verify from direct.directutil import Verify
from panda3d.core import ConfigVariableBool # Don't import libpandaexpressModules, which doesn't get built until
# genPyCode.
import direct.extensions_native.extension_native_helpers
from libpandaexpress import ConfigVariableBool
ScalarTypes = (types.FloatType, types.IntType, types.LongType) ScalarTypes = (types.FloatType, types.IntType, types.LongType)