Oops, checked in the wrong file

direct/src/directutil/DirectMySQLdbConnection.py

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

direct/src/showbase/PythonUtil.py

@@ -61,7 +61,10 @@ import bisect
 __report_indent = 3
 
 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)