TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Oops, checked in the wrong file

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
direct/src/directutil/DirectMySQLdbConnection.py
View File

@ -8,19 +8,16 @@ class DirectMySQLdbConnection(Connection):
from MySQLdb.constants import CLIENT, FIELD_TYPE from MySQLdb.constants import CLIENT, FIELD_TYPE
from MySQLdb.converters import conversions from MySQLdb.converters import conversions
from weakref import proxy, WeakValueDictionary from weakref import proxy, WeakValueDictionary
import types import types
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 ])
self.cursorclass = kwargs2.pop('cursorclass', self.default_cursor) self.cursorclass = kwargs2.pop('cursorclass', self.default_cursor)
charset = kwargs2.pop('charset', '') charset = kwargs2.pop('charset', '')
@ -28,7 +25,7 @@ class DirectMySQLdbConnection(Connection):
use_unicode = True use_unicode = True
else: else:
use_unicode = False use_unicode = False
use_unicode = kwargs2.pop('use_unicode', use_unicode) use_unicode = kwargs2.pop('use_unicode', use_unicode)
sql_mode = kwargs2.pop('sql_mode', '') sql_mode = kwargs2.pop('sql_mode', '')

5
direct/src/showbase/PythonUtil.py
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)