Commits

Ronald Oussoren committed b0eef3b

Small tweaks to ensure that most tests pass

Not all tests pass with this, failures seem to be related
to either running in a ssh session or the OSX 10.7 port.

Comments (0)

Files changed (16)

pyobjc-core/Lib/PyObjCTools/_BSCompiler.py

     fp.write("}\n")
 
 def emit_constants(fp, tree):
-
+    fixed = {}
     fp.write("constants = '''$")
     for node in tree.findall('.//constant'):
         if node.get('ignore', 'false') == 'true':
             continue
         name = node.get("name")
         type = rewrite_typestr(node.get("type", "@"))
+        type64 = node.get("type64", None)
+        if type64 is not None:
+            type64 = rewrite_typestr(type64)
 
         if type[0] == '{':
             _, rest = type.split('=', 1)
                 # other unhandled types
                 continue
 
-        type = rewrite_typestr(type)
+        if type64 is not None and type64 != type:
+            fixed[name] = sel32or64(type, type64)
+            continue
+
 
         if node.get("magic_cookie", "false") == "true":
             type = "=" + type
             fp.write(type)
         fp.write("$")
     fp.write("'''\n")
+    if fixed:
+        fp.write("constants_dict = %r\n"%(fixed,))
 
 
 def emit_enums(fp, tree):

pyobjc-core/Lib/objc/_lazyimport.py

         self.__dict__.update(metadict.get('misc', {}))
         self.__parents = parents
         self.__varmap = metadict.get('constants')
+        self.__varmap_dct = metadict.get('constants_dict', {})
         self.__enummap = metadict.get('enums')
         self.__funcmap = metadict.get('functions')
         self.__inlinelist = inline_list
         all = set()
 
         # Ensure that all dynamic entries get loaded
+        if self.__varmap_dct:
+            for nm in self.__varmap_dct:
+                try:
+                    getattr(self, nm)
+                except AttributeError:
+                    pass
+
         if self.__varmap:
             for nm in re.findall(r"\$([A-Z0-9a-z_]*)(?:@[^$]*)?(?=\$)", self.__varmap):
                 try:
         # FIXME: Loading variables and functions requires too much
         # code at the moment, the objc API can be adjusted for
         # this later on.
+        if self.__varmap_dct:
+            if name in self.__varmap_dct:
+                tp = self.__varmap_dct[name]
+                return objc._loadConstant(name, tp, False)
+
         if self.__varmap:
             m = re.search(r"\$%s(@[^$]*)?\$"%(name,), self.__varmap)
             if m is not None:

pyobjc-framework-Quartz/Lib/Quartz/CoreGraphics/__init__.py

 
     import Quartz.CoreGraphics._callbacks as m
     for nm in dir(m):
+        if nm.startswith('_'): continue
         setattr(mod, nm, getattr(m, nm))
     import Quartz.CoreGraphics._doubleindirect as m
     for nm in dir(m):
+        if nm.startswith('_'): continue
         setattr(mod, nm, getattr(m, nm))
     import Quartz.CoreGraphics._sortandmap as m
     for nm in dir(m):
+        if nm.startswith('_'): continue
         setattr(mod, nm, getattr(m, nm))
     import Quartz.CoreGraphics._coregraphics as m
     for nm in dir(m):
+        if nm.startswith('_'): continue
         setattr(mod, nm, getattr(m, nm))
     import Quartz.CoreGraphics._contextmanager as m
     for nm in dir(m):
+        if nm.startswith('_'): continue
         setattr(mod, nm, getattr(m, nm))
 
     mod.setCGPathElement(mod.CGPathElement)

pyobjc-framework-Quartz/Lib/Quartz/CoreGraphics/_contextmanager.py

 This module defines a number of context managers. These are meant to be used
 in the context of the with statement (introduced in Python 2.5).
 """
-from Quartz.CoreGraphics import *
-
 __all__ = ('CGSavedGState', 'CGTransparencyLayer',  'CGContextPage')
-
+import Quartz.CoreGraphics as CG
 
 class CGSavedGState (object):
     """
         self.context = context
 
     def __enter__(self):
-        CGContextSaveGState(self.context)
+        CG.CGContextSaveGState(self.context)
         return self
 
     def __exit__(self, exc_type, exc_value, exc_tp):
-        CGContextRestoreGState(self.context)
+        CG.CGContextRestoreGState(self.context)
         return False
 
 class CGTransparencyLayer (object):
 
     def __enter__(self):
         if self.rect is None:
-            result = CGContextBeginTransparencyLayer(self.context, self.info)
+            result = CG.CGContextBeginTransparencyLayer(self.context, self.info)
         else:
-            result = CGContextBeginTransparencyLayerWithRect(self.context, self.rect, self.info)
+            result = CG.CGContextBeginTransparencyLayerWithRect(self.context, self.rect, self.info)
         return result
 
     def __exit__(self, exc_type, exc_value, exc_tp):
-        CGContextEndTransparencyLayer(self.context)
+        CG.CGContextEndTransparencyLayer(self.context)
         return False
 
 class CGContextPage (object):
         self.mediaBox = mediaBox
 
     def __enter__(self):
-        mediaRect = CGContextBeginPage(self.context, self.mediaBox)
+        mediaRect = CG.CGContextBeginPage(self.context, self.mediaBox)
 
     def __exit__(self, exc_type, exc_value, exc_tp):
-        CGContextEndPage(self.context)
+        CG.CGContextEndPage(self.context)
         return False
 
 

pyobjc-framework-Quartz/Lib/Quartz/CoreGraphics/_metadata.py

 # Generated file, don't edit
 # Source: BridgeSupport/CoreGraphics.bridgesupport
-# Last update: Thu Jul 21 17:06:22 2011
+# Last update: Sun Jul 24 21:38:04 2011
 
 import objc, sys
 
     "CGScreenUpdateMoveDelta": objc.createStructType('CGScreenUpdateMoveDelta', b'{_CGScreenUpdateMoveDelta="dX"i"dY"i}', None),
     "CGSize": objc.createStructType('CGSize', sel32or64(b'{CGSize="width"f"height"f}', b'{CGSize="width"d"height"d}'), None),
 }
-constants = '''$CGAffineTransformIdentity@{CGAffineTransform=ffffff}$CGPointZero@{CGPoint=ff}$CGRectInfinite@{CGRect={CGPoint=ff}{CGSize=ff}}$CGRectNull@{CGRect={CGPoint=ff}{CGSize=ff}}$CGRectZero@{CGRect={CGPoint=ff}{CGSize=ff}}$CGSizeZero@{CGSize=ff}$kCGColorBlack@^{__CFString=}$kCGColorClear@^{__CFString=}$kCGColorSpaceGenericGrayGamma2_2@^{__CFString=}$kCGColorSpaceAdobeRGB1998@^{__CFString=}$kCGColorSpaceGenericCMYK@^{__CFString=}$kCGColorSpaceGenericGray@^{__CFString=}$kCGColorSpaceGenericRGB@^{__CFString=}$kCGColorSpaceGenericRGBLinear@^{__CFString=}$kCGColorSpaceSRGB@^{__CFString=}$kCGColorWhite@^{__CFString=}$kCGFontVariationAxisDefaultValue@^{__CFString=}$kCGFontVariationAxisMaxValue@^{__CFString=}$kCGFontVariationAxisMinValue@^{__CFString=}$kCGFontVariationAxisName@^{__CFString=}$kCGPDFContextAllowsCopying@^{__CFString=}$kCGPDFContextAllowsPrinting@^{__CFString=}$kCGPDFContextArtBox@^{__CFString=}$kCGPDFContextAuthor@^{__CFString=}$kCGPDFContextBleedBox@^{__CFString=}$kCGPDFContextCreator@^{__CFString=}$kCGPDFContextCropBox@^{__CFString=}$kCGPDFContextEncryptionKeyLength@^{__CFString=}$kCGPDFContextKeywords@^{__CFString=}$kCGPDFContextMediaBox@^{__CFString=}$kCGPDFContextOutputIntent@^{__CFString=}$kCGPDFContextOutputIntents@^{__CFString=}$kCGPDFContextOwnerPassword@^{__CFString=}$kCGPDFContextSubject@^{__CFString=}$kCGPDFContextTitle@^{__CFString=}$kCGPDFContextTrimBox@^{__CFString=}$kCGPDFContextUserPassword@^{__CFString=}$kCGPDFXDestinationOutputProfile@^{__CFString=}$kCGPDFXInfo@^{__CFString=}$kCGPDFXOutputCondition@^{__CFString=}$kCGPDFXOutputConditionIdentifier@^{__CFString=}$kCGPDFXOutputIntentSubtype@^{__CFString=}$kCGPDFXRegistryName@^{__CFString=}$kCGWindowAlpha@^{__CFString=}$kCGWindowBackingLocationVideoMemory@^{__CFString=}$kCGWindowBounds@^{__CFString=}$kCGWindowIsOnscreen@^{__CFString=}$kCGWindowLayer@^{__CFString=}$kCGWindowMemoryUsage@^{__CFString=}$kCGWindowName@^{__CFString=}$kCGWindowNumber@^{__CFString=}$kCGWindowOwnerName@^{__CFString=}$kCGWindowOwnerPID@^{__CFString=}$kCGWindowSharingState@^{__CFString=}$kCGWindowStoreType@^{__CFString=}$kCGWindowWorkspace@^{__CFString=}$'''
+constants = '''$kCGColorBlack@^{__CFString=}$kCGColorClear@^{__CFString=}$kCGColorSpaceGenericGrayGamma2_2@^{__CFString=}$kCGColorSpaceAdobeRGB1998@^{__CFString=}$kCGColorSpaceGenericCMYK@^{__CFString=}$kCGColorSpaceGenericGray@^{__CFString=}$kCGColorSpaceGenericRGB@^{__CFString=}$kCGColorSpaceGenericRGBLinear@^{__CFString=}$kCGColorSpaceSRGB@^{__CFString=}$kCGColorWhite@^{__CFString=}$kCGFontVariationAxisDefaultValue@^{__CFString=}$kCGFontVariationAxisMaxValue@^{__CFString=}$kCGFontVariationAxisMinValue@^{__CFString=}$kCGFontVariationAxisName@^{__CFString=}$kCGPDFContextAllowsCopying@^{__CFString=}$kCGPDFContextAllowsPrinting@^{__CFString=}$kCGPDFContextArtBox@^{__CFString=}$kCGPDFContextAuthor@^{__CFString=}$kCGPDFContextBleedBox@^{__CFString=}$kCGPDFContextCreator@^{__CFString=}$kCGPDFContextCropBox@^{__CFString=}$kCGPDFContextEncryptionKeyLength@^{__CFString=}$kCGPDFContextKeywords@^{__CFString=}$kCGPDFContextMediaBox@^{__CFString=}$kCGPDFContextOutputIntent@^{__CFString=}$kCGPDFContextOutputIntents@^{__CFString=}$kCGPDFContextOwnerPassword@^{__CFString=}$kCGPDFContextSubject@^{__CFString=}$kCGPDFContextTitle@^{__CFString=}$kCGPDFContextTrimBox@^{__CFString=}$kCGPDFContextUserPassword@^{__CFString=}$kCGPDFXDestinationOutputProfile@^{__CFString=}$kCGPDFXInfo@^{__CFString=}$kCGPDFXOutputCondition@^{__CFString=}$kCGPDFXOutputConditionIdentifier@^{__CFString=}$kCGPDFXOutputIntentSubtype@^{__CFString=}$kCGPDFXRegistryName@^{__CFString=}$kCGWindowAlpha@^{__CFString=}$kCGWindowBackingLocationVideoMemory@^{__CFString=}$kCGWindowBounds@^{__CFString=}$kCGWindowIsOnscreen@^{__CFString=}$kCGWindowLayer@^{__CFString=}$kCGWindowMemoryUsage@^{__CFString=}$kCGWindowName@^{__CFString=}$kCGWindowNumber@^{__CFString=}$kCGWindowOwnerName@^{__CFString=}$kCGWindowOwnerPID@^{__CFString=}$kCGWindowSharingState@^{__CFString=}$kCGWindowStoreType@^{__CFString=}$kCGWindowWorkspace@^{__CFString=}$'''
+constants_dict = {'CGRectZero': sel32or64('{CGRect={CGPoint=ff}{CGSize=ff}}', '{CGRect={CGPoint=dd}{CGSize=dd}}'), 'CGAffineTransformIdentity': sel32or64('{CGAffineTransform=ffffff}', '{CGAffineTransform=dddddd}'), 'CGRectNull': sel32or64('{CGRect={CGPoint=ff}{CGSize=ff}}', '{CGRect={CGPoint=dd}{CGSize=dd}}'), 'CGPointZero': sel32or64('{CGPoint=ff}', '{CGPoint=dd}'), 'CGRectInfinite': sel32or64('{CGRect={CGPoint=ff}{CGSize=ff}}', '{CGRect={CGPoint=dd}{CGSize=dd}}'), 'CGSizeZero': sel32or64('{CGSize=ff}', '{CGSize=dd}')}
 enums = '''$CGDisplayNoErr@0$CGEventNoErr@0$CGFLOAT_DEFINED@1$CGGlyphMax@65534$CGGlyphMin@0$CGPDFDataFormatJPEG2000@2$CGPDFDataFormatJPEGEncoded@1$CGPDFDataFormatRaw@0$CGRectMaxXEdge@2$CGRectMaxYEdge@3$CGRectMinXEdge@0$CGRectMinYEdge@1$kCGAnnotatedSessionEventTap@2$kCGAnyInputEventType@4294967295$kCGAssistiveTechHighWindowLevelKey@20$kCGBackingStoreBuffered@2$kCGBackingStoreNonretained@1$kCGBackingStoreRetained@0$kCGBackstopMenuLevelKey@3$kCGBaseWindowLevelKey@0$kCGBitmapAlphaInfoMask@31$kCGBitmapByteOrder16Big@12288$kCGBitmapByteOrder16Little@4096$kCGBitmapByteOrder32Big@16384$kCGBitmapByteOrder32Little@8192$kCGBitmapByteOrderDefault@0$kCGBitmapByteOrderMask@28672$kCGBitmapFloatComponents@256$kCGBlendModeClear@16$kCGBlendModeColor@14$kCGBlendModeColorBurn@7$kCGBlendModeColorDodge@6$kCGBlendModeCopy@17$kCGBlendModeDarken@4$kCGBlendModeDestinationAtop@24$kCGBlendModeDestinationIn@22$kCGBlendModeDestinationOut@23$kCGBlendModeDestinationOver@21$kCGBlendModeDifference@10$kCGBlendModeExclusion@11$kCGBlendModeHardLight@9$kCGBlendModeHue@12$kCGBlendModeLighten@5$kCGBlendModeLuminosity@15$kCGBlendModeMultiply@1$kCGBlendModeNormal@0$kCGBlendModeOverlay@3$kCGBlendModePlusDarker@26$kCGBlendModePlusLighter@27$kCGBlendModeSaturation@13$kCGBlendModeScreen@2$kCGBlendModeSoftLight@8$kCGBlendModeSourceAtop@20$kCGBlendModeSourceIn@18$kCGBlendModeSourceOut@19$kCGBlendModeXOR@25$kCGCaptureNoFill@1$kCGCaptureNoOptions@0$kCGColorSpaceModelCMYK@2$kCGColorSpaceModelDeviceN@4$kCGColorSpaceModelIndexed@5$kCGColorSpaceModelLab@3$kCGColorSpaceModelMonochrome@0$kCGColorSpaceModelPattern@6$kCGColorSpaceModelRGB@1$kCGColorSpaceModelUnknown@-1$kCGConfigureForAppOnly@0$kCGConfigureForSession@1$kCGConfigurePermanently@2$kCGCursorWindowLevelKey@19$kCGDesktopIconWindowLevelKey@18$kCGDesktopWindowLevelKey@2$kCGDisplayAddFlag@16$kCGDisplayBeginConfigurationFlag@1$kCGDisplayBlendNormal@0.0$kCGDisplayBlendSolidColor@1.0$kCGDisplayDesktopShapeChangedFlag@4096$kCGDisplayDisabledFlag@512$kCGDisplayEnabledFlag@256$kCGDisplayFadeReservationInvalidToken@0$kCGDisplayMirrorFlag@1024$kCGDisplayMovedFlag@2$kCGDisplayRemoveFlag@32$kCGDisplaySetMainFlag@4$kCGDisplaySetModeFlag@8$kCGDisplayUnMirrorFlag@2048$kCGDockWindowLevelKey@7$kCGDraggingWindowLevelKey@12$kCGEncodingFontSpecific@0$kCGEncodingMacRoman@1$kCGErrorApplicationAlreadyRunning@1025$kCGErrorApplicationCanOnlyBeRunInOneSessionAtATime@1026$kCGErrorApplicationIncorrectExecutableFormatFound@1023$kCGErrorApplicationIsLaunching@1024$kCGErrorApplicationNotPermittedToExecute@1016$kCGErrorApplicationRequiresNewerSystem@1015$kCGErrorCannotComplete@1004$kCGErrorClassicApplicationsMustBeLaunchedByClassic@1027$kCGErrorFailure@1000$kCGErrorFirst@1000$kCGErrorForkFailed@1028$kCGErrorIllegalArgument@1001$kCGErrorInvalidConnection@1002$kCGErrorInvalidContext@1003$kCGErrorInvalidOperation@1010$kCGErrorLast@1029$kCGErrorNameTooLong@1005$kCGErrorNoCurrentPoint@1009$kCGErrorNoneAvailable@1011$kCGErrorNotImplemented@1006$kCGErrorRangeCheck@1007$kCGErrorRetryRegistration@1029$kCGErrorSuccess@0$kCGErrorTypeCheck@1008$kCGEventFilterMaskPermitLocalKeyboardEvents@2$kCGEventFilterMaskPermitLocalMouseEvents@1$kCGEventFilterMaskPermitSystemDefinedEvents@4$kCGEventFlagMaskAlphaShift@65536$kCGEventFlagMaskAlternate@524288$kCGEventFlagMaskCommand@1048576$kCGEventFlagMaskControl@262144$kCGEventFlagMaskHelp@4194304$kCGEventFlagMaskNonCoalesced@256$kCGEventFlagMaskNumericPad@2097152$kCGEventFlagMaskSecondaryFn@8388608$kCGEventFlagMaskShift@131072$kCGEventFlagsChanged@12$kCGEventKeyDown@10$kCGEventKeyUp@11$kCGEventLeftMouseDown@1$kCGEventLeftMouseDragged@6$kCGEventLeftMouseUp@2$kCGEventMouseMoved@5$kCGEventMouseSubtypeDefault@0$kCGEventMouseSubtypeTabletPoint@1$kCGEventMouseSubtypeTabletProximity@2$kCGEventNull@0$kCGEventOtherMouseDown@25$kCGEventOtherMouseDragged@27$kCGEventOtherMouseUp@26$kCGEventRightMouseDown@3$kCGEventRightMouseDragged@7$kCGEventRightMouseUp@4$kCGEventScrollWheel@22$kCGEventSourceGroupID@44$kCGEventSourceStateCombinedSessionState@0$kCGEventSourceStateHIDSystemState@1$kCGEventSourceStateID@45$kCGEventSourceStatePrivate@-1$kCGEventSourceUnixProcessID@41$kCGEventSourceUserData@42$kCGEventSourceUserID@43$kCGEventSuppressionStateRemoteMouseDrag@1$kCGEventSuppressionStateSuppressionInterval@0$kCGEventSupressionStateRemoteMouseDrag@1$kCGEventSupressionStateSupressionInterval@0$kCGEventTabletPointer@23$kCGEventTabletProximity@24$kCGEventTapDisabledByTimeout@-2$kCGEventTapDisabledByUserInput@-1$kCGEventTapOptionDefault@0$kCGEventTapOptionListenOnly@1$kCGEventTargetProcessSerialNumber@39$kCGEventTargetUnixProcessID@40$kCGFloatingWindowLevelKey@5$kCGFontIndexInvalid@65535$kCGFontIndexMax@65534$kCGFontPostScriptFormatType1@1$kCGFontPostScriptFormatType3@3$kCGFontPostScriptFormatType42@42$kCGGlyphMax@65534$kCGGradientDrawsAfterEndLocation@2$kCGGradientDrawsBeforeStartLocation@1$kCGHIDEventTap@0$kCGHeadInsertEventTap@0$kCGHelpWindowLevelKey@16$kCGImageAlphaFirst@4$kCGImageAlphaLast@3$kCGImageAlphaNone@0$kCGImageAlphaNoneSkipFirst@6$kCGImageAlphaNoneSkipLast@5$kCGImageAlphaOnly@7$kCGImageAlphaPremultipliedFirst@2$kCGImageAlphaPremultipliedLast@1$kCGInterpolationDefault@0$kCGInterpolationHigh@3$kCGInterpolationLow@2$kCGInterpolationNone@1$kCGKeyboardEventAutorepeat@8$kCGKeyboardEventKeyboardType@10$kCGKeyboardEventKeycode@9$kCGLineCapButt@0$kCGLineCapRound@1$kCGLineCapSquare@2$kCGLineJoinBevel@2$kCGLineJoinMiter@0$kCGLineJoinRound@1$kCGMainMenuWindowLevelKey@8$kCGMaxDisplayReservationInterval@15.0$kCGMaximumWindowLevelKey@14$kCGMinimumWindowLevelKey@1$kCGModalPanelWindowLevelKey@10$kCGMouseButtonCenter@2$kCGMouseButtonLeft@0$kCGMouseButtonRight@1$kCGMouseDownEventMaskingDeadSwitchTimeout@60.0$kCGMouseEventButtonNumber@3$kCGMouseEventClickState@1$kCGMouseEventDeltaX@4$kCGMouseEventDeltaY@5$kCGMouseEventInstantMouser@6$kCGMouseEventNumber@0$kCGMouseEventPressure@2$kCGMouseEventSubtype@7$kCGNormalWindowLevelKey@4$kCGNullDirectDisplay@0$kCGNullWindowID@0$kCGNumReservedWindowLevels@16$kCGNumberOfEventSuppressionStates@2$kCGNumberOfEventSupressionStates@2$kCGNumberOfWindowLevelKeys@21$kCGOverlayWindowLevelKey@15$kCGPDFArtBox@4$kCGPDFBleedBox@2$kCGPDFCropBox@1$kCGPDFMediaBox@0$kCGPDFObjectTypeArray@7$kCGPDFObjectTypeBoolean@2$kCGPDFObjectTypeDictionary@8$kCGPDFObjectTypeInteger@3$kCGPDFObjectTypeName@5$kCGPDFObjectTypeNull@1$kCGPDFObjectTypeReal@4$kCGPDFObjectTypeStream@9$kCGPDFObjectTypeString@6$kCGPDFTrimBox@3$kCGPathEOFill@1$kCGPathEOFillStroke@4$kCGPathElementAddCurveToPoint@3$kCGPathElementAddLineToPoint@1$kCGPathElementAddQuadCurveToPoint@2$kCGPathElementCloseSubpath@4$kCGPathElementMoveToPoint@0$kCGPathFill@0$kCGPathFillStroke@3$kCGPathStroke@2$kCGPatternTilingConstantSpacing@2$kCGPatternTilingConstantSpacingMinimalDistortion@1$kCGPatternTilingNoDistortion@0$kCGPopUpMenuWindowLevelKey@11$kCGRenderingIntentAbsoluteColorimetric@1$kCGRenderingIntentDefault@0$kCGRenderingIntentPerceptual@3$kCGRenderingIntentRelativeColorimetric@2$kCGRenderingIntentSaturation@4$kCGScreenSaverWindowLevelKey@13$kCGScreenUpdateOperationMove@1$kCGScreenUpdateOperationReducedDirtyRectangleCount@-2147483648$kCGScreenUpdateOperationRefresh@0$kCGScrollEventUnitLine@1$kCGScrollEventUnitPixel@0$kCGScrollWheelEventDeltaAxis1@11$kCGScrollWheelEventDeltaAxis2@12$kCGScrollWheelEventDeltaAxis3@13$kCGScrollWheelEventFixedPtDeltaAxis1@93$kCGScrollWheelEventFixedPtDeltaAxis2@94$kCGScrollWheelEventFixedPtDeltaAxis3@95$kCGScrollWheelEventInstantMouser@14$kCGScrollWheelEventIsContinuous@88$kCGScrollWheelEventPointDeltaAxis1@96$kCGScrollWheelEventPointDeltaAxis2@97$kCGScrollWheelEventPointDeltaAxis3@98$kCGSessionEventTap@1$kCGStatusWindowLevelKey@9$kCGTabletEventDeviceID@24$kCGTabletEventPointButtons@18$kCGTabletEventPointPressure@19$kCGTabletEventPointX@15$kCGTabletEventPointY@16$kCGTabletEventPointZ@17$kCGTabletEventRotation@22$kCGTabletEventTangentialPressure@23$kCGTabletEventTiltX@20$kCGTabletEventTiltY@21$kCGTabletEventVendor1@25$kCGTabletEventVendor2@26$kCGTabletEventVendor3@27$kCGTabletProximityEventCapabilityMask@36$kCGTabletProximityEventDeviceID@31$kCGTabletProximityEventEnterProximity@38$kCGTabletProximityEventPointerID@30$kCGTabletProximityEventPointerType@37$kCGTabletProximityEventSystemTabletID@32$kCGTabletProximityEventTabletID@29$kCGTabletProximityEventVendorID@28$kCGTabletProximityEventVendorPointerSerialNumber@34$kCGTabletProximityEventVendorPointerType@33$kCGTabletProximityEventVendorUniqueID@35$kCGTailAppendEventTap@1$kCGTextClip@7$kCGTextFill@0$kCGTextFillClip@4$kCGTextFillStroke@2$kCGTextFillStrokeClip@6$kCGTextInvisible@3$kCGTextStroke@1$kCGTextStrokeClip@5$kCGTornOffMenuWindowLevelKey@6$kCGUtilityWindowLevelKey@17$kCGWindowBackingCFNumberType@3$kCGWindowIDCFNumberType@3$kCGWindowImageBoundsIgnoreFraming@1$kCGWindowImageDefault@0$kCGWindowImageOnlyShadows@4$kCGWindowImageShouldBeOpaque@2$kCGWindowListExcludeDesktopElements@16$kCGWindowListOptionAll@0$kCGWindowListOptionIncludingWindow@8$kCGWindowListOptionOnScreenAboveWindow@2$kCGWindowListOptionOnScreenBelowWindow@4$kCGWindowListOptionOnScreenOnly@1$kCGWindowSharingCFNumberType@3$kCGWindowSharingNone@0$kCGWindowSharingReadOnly@1$kCGWindowSharingReadWrite@2$'''
 misc.update({'CGFLOAT_IS_DOUBLE': sel32or64(0, 1), 'CGFLOAT_MAX': sel32or64(3.4028234663852886e+38, 1.7976931348623157e+308), 'kCGBitmapByteOrder16Host': littleOrBig(4096, 12288), 'CGFLOAT_MIN': sel32or64(1.1754943508222875e-38, 2.2250738585072014e-308), 'kCGBitmapByteOrder32Host': littleOrBig(8192, 16384)})
 misc.update({'kCGDisplayModeIsTelevisionOutput': 'kCGDisplayModeIsTelevisionOutput', 'kCGColorSpaceUserRGB': 'kCGColorSpaceUserRGB', 'kCGSessionUserNameKey': 'kCGSSessionUserNameKey', 'kCGSessionOnConsoleKey': 'kCGSSessionOnConsoleKey', 'kCGDisplayIOFlags': 'IOFlags', 'kCGDisplayModeIsStretched': 'kCGDisplayModeIsStretched', 'kCGNotifyGUIConsoleSessionChanged': 'com.apple.coregraphics.GUIConsoleSessionChanged', 'kCGSessionUserIDKey': 'kCGSSessionUserIDKey', 'kCGDisplayModeIsInterlaced': 'kCGDisplayModeIsInterlaced', 'kCGDisplayHeight': 'Height', 'kCGDisplayBitsPerSample': 'BitsPerSample', 'kCGDisplayWidth': 'Width', 'kCGDisplaySamplesPerPixel': 'SamplesPerPixel', 'kCGNotifyEventTapRemoved': 'com.apple.coregraphics.eventTapRemoved', 'kCGSessionConsoleSetKey': 'kCGSSessionConsoleSetKey', 'kCGColorSpaceUserCMYK': 'kCGColorSpaceUserCMYK', 'kCGDisplayRefreshRate': 'RefreshRate', 'kCGDisplayBytesPerRow': 'kCGDisplayBytesPerRow', 'kCGDisplayBitsPerPixel': 'BitsPerPixel', 'kCGDisplayModeUsableForDesktopGUI': 'UsableForDesktopGUI', 'kCGSessionLoginDoneKey': 'kCGSessionLoginDoneKey', 'kCGColorSpaceUserGray': 'kCGColorSpaceUserGray', 'kCGIODisplayModeID': 'IODisplayModeID', 'kCGDisplayMode': 'Mode', 'kCGNotifyEventTapAdded': 'com.apple.coregraphics.eventTapAdded', 'kCGDisplayModeIsSafeForHardware': 'kCGDisplayModeIsSafeForHardware', 'kCGNotifyGUISessionUserChanged': 'com.apple.coregraphics.GUISessionUserChanged'})

pyobjc-framework-Quartz/Lib/Quartz/CoreVideo/__init__.py

     Quartz.CoreVideo = mod
     import Quartz.CoreVideo._CVPixelBuffer as m
     for nm in dir(m):
+        if nm.startswith('_'): continue
         setattr(mod, nm, getattr(m, nm))
 _load(mod)

pyobjc-framework-Quartz/Lib/Quartz/CoreVideo/_metadata.py

 # Generated file, don't edit
 # Source: BridgeSupport/CoreVideo.bridgesupport
-# Last update: Thu Jul 21 17:06:23 2011
+# Last update: Sun Jul 24 21:38:04 2011
 
 import objc, sys
 

pyobjc-framework-Quartz/Lib/Quartz/ImageIO/_metadata.py

 # Generated file, don't edit
 # Source: BridgeSupport/ImageIO.bridgesupport
-# Last update: Thu Jul 21 17:06:24 2011
+# Last update: Sun Jul 24 21:38:04 2011
 
 import objc, sys
 

pyobjc-framework-Quartz/Lib/Quartz/ImageKit/_metadata.py

 # Generated file, don't edit
 # Source: BridgeSupport/ImageKit.bridgesupport
-# Last update: Thu Jul 21 17:06:25 2011
+# Last update: Sun Jul 24 21:38:05 2011
 
 import objc, sys
 

pyobjc-framework-Quartz/Lib/Quartz/PDFKit/_metadata.py

 # Generated file, don't edit
 # Source: BridgeSupport/PDFKit.bridgesupport
-# Last update: Thu Jul 21 17:06:25 2011
+# Last update: Sun Jul 24 21:38:05 2011
 
 import objc, sys
 

pyobjc-framework-Quartz/Lib/Quartz/QuartzComposer/_metadata.py

 # Generated file, don't edit
 # Source: BridgeSupport/QuartzComposer.bridgesupport
-# Last update: Thu Jul 21 17:06:26 2011
+# Last update: Sun Jul 24 21:38:05 2011
 
 import objc, sys
 

pyobjc-framework-Quartz/Lib/Quartz/QuartzCore/_metadata.py

 # Generated file, don't edit
 # Source: BridgeSupport/QuartzCore.bridgesupport
-# Last update: Thu Jul 21 17:06:27 2011
+# Last update: Sun Jul 24 21:38:05 2011
 
 import objc, sys
 
 misc = {
     "CATransform3D": objc.createStructType('CATransform3D', sel32or64(b'{CATransform3D="m11"f"m12"f"m13"f"m14"f"m21"f"m22"f"m23"f"m24"f"m31"f"m32"f"m33"f"m34"f"m41"f"m42"f"m43"f"m44"f}', b'{CATransform3D="m11"d"m12"d"m13"d"m14"d"m21"d"m22"d"m23"d"m24"d"m31"d"m32"d"m33"d"m34"d"m41"d"m42"d"m43"d"m44"d}'), None),
 }
-constants = '''$CATransform3DIdentity@{CATransform3D=ffffffffffffffff}$kCIOutputNativeSizeKey$kCAValueFunctionRotateX$kCAValueFunctionRotateY$kCAValueFunctionRotateZ$kCAValueFunctionScale$kCAValueFunctionScaleX$kCAValueFunctionScaleY$kCAValueFunctionScaleZ$kCAValueFunctionTranslate$kCAValueFunctionTranslateX$kCAValueFunctionTranslateY$kCAValueFunctionTranslateZ$kCATransactionAnimationTimingFunction$kCATransactionCompletionBlock$kCAMediaTimingFunctionDefault$kCAFillRuleNonZero$kCAFillRuleEvenOdd$kCALineJoinMiter$kCALineJoinRound$kCALineJoinRound$kCALineCapButt$kCALineCapRound$kCALineCapSquare$kCAFilterTrilinear$kCAGradientLayerAxial$kCAEmitterLayerPoint$kCAEmitterLayerLine$kCAEmitterLayerRectangle$kCAEmitterLayerCuboid$kCAEmitterLayerCircle$kCAEmitterLayerSphere$kCAEmitterLayerPoints$kCAEmitterLayerOutline$kCAEmitterLayerSurface$kCAEmitterLayerVolume$kCAEmitterLayerUnordered$kCAEmitterLayerOldestFirst$kCAEmitterLayerOldestLast$kCAEmitterLayerBackToFront$kCAEmitterLayerAdditive$kCAAlignmentCenter$kCAAlignmentJustified$kCAAlignmentLeft$kCAAlignmentNatural$kCAAlignmentRight$kCAAnimationDiscrete$kCAAnimationLinear$kCAAnimationPaced$kCAAnimationRotateAuto$kCAAnimationRotateAutoReverse$kCAFillModeBackwards$kCAFillModeBoth$kCAFillModeForwards$kCAFillModeFrozen$kCAFillModeRemoved$kCAFilterLinear$kCAFilterNearest$kCAGravityBottom$kCAGravityBottomLeft$kCAGravityBottomRight$kCAGravityCenter$kCAGravityLeft$kCAGravityResize$kCAGravityResizeAspect$kCAGravityResizeAspectFill$kCAGravityRight$kCAGravityTop$kCAGravityTopLeft$kCAGravityTopRight$kCAMediaTimingFunctionEaseIn$kCAMediaTimingFunctionEaseInEaseOut$kCAMediaTimingFunctionEaseOut$kCAMediaTimingFunctionLinear$kCAOnOrderIn$kCAOnOrderOut$kCAScrollBoth$kCAScrollHorizontally$kCAScrollNone$kCAScrollVertically$kCATransactionAnimationDuration$kCATransactionDisableActions$kCATransition$kCATransitionFade$kCATransitionFromBottom$kCATransitionFromLeft$kCATransitionFromRight$kCATransitionFromTop$kCATransitionMoveIn$kCATransitionPush$kCATransitionReveal$kCATruncationEnd$kCATruncationMiddle$kCATruncationNone$kCATruncationStart$kCIApplyOptionDefinition$kCIApplyOptionExtent$kCIApplyOptionUserInfo$kCIAttributeClass$kCIAttributeDefault$kCIAttributeDescription$kCIAttributeDisplayName$kCIAttributeFilterCategories$kCIAttributeFilterDisplayName$kCIAttributeFilterName$kCIAttributeIdentity$kCIAttributeMax$kCIAttributeMin$kCIAttributeName$kCIAttributeReferenceDocumentation$kCIAttributeSliderMax$kCIAttributeSliderMin$kCIAttributeType$kCIAttributeTypeAngle$kCIAttributeTypeBoolean$kCIAttributeTypeCount$kCIAttributeTypeDistance$kCIAttributeTypeGradient$kCIAttributeTypeInteger$kCIAttributeTypeOffset$kCIAttributeTypeOpaqueColor$kCIAttributeTypePosition$kCIAttributeTypePosition3$kCIAttributeTypeRectangle$kCIAttributeTypeScalar$kCIAttributeTypeTime$kCICategoryBlur$kCICategoryBuiltIn$kCICategoryColorAdjustment$kCICategoryColorEffect$kCICategoryCompositeOperation$kCICategoryDistortionEffect$kCICategoryFilterGenerator$kCICategoryGenerator$kCICategoryGeometryAdjustment$kCICategoryGradient$kCICategoryHalftoneEffect$kCICategoryHighDynamicRange$kCICategoryInterlaced$kCICategoryNonSquarePixels$kCICategoryReduction$kCICategorySharpen$kCICategoryStillImage$kCICategoryStylize$kCICategoryTileEffect$kCICategoryTransition$kCICategoryVideo$kCIContextOutputColorSpace$kCIContextUseSoftwareRenderer$kCIContextWorkingColorSpace$kCIFilterGeneratorExportedKey$kCIFilterGeneratorExportedKeyName$kCIFilterGeneratorExportedKeyTargetObject$kCIFormatARGB8@i$kCIFormatRGBA16@i$kCIFormatRGBAf@i$kCIImageColorSpace$kCIImageProviderTileSize$kCIImageProviderUserInfo$kCIInputAllowDraftModeKey$kCIInputAngleKey$kCIInputAspectRatioKey$kCIInputBackgroundImageKey$kCIInputBiasKey$kCIInputBoostKey$kCIInputBoostShadowAmountKey$kCIInputBrightnessKey$kCIInputCenterKey$kCIInputColorKey$kCIInputContrastKey$kCIInputDecoderVersionKey$kCIInputEVKey$kCIInputEnableChromaticNoiseTrackingKey$kCIInputEnableSharpeningKey$kCIInputExtentKey$kCIInputGradientImageKey$kCIInputIgnoreImageOrientationKey$kCIInputImageKey$kCIInputImageOrientationKey$kCIInputIntensityKey$kCIInputMaskImageKey$kCIInputNeutralChromaticityXKey$kCIInputNeutralChromaticityYKey$kCIInputNeutralLocationKey$kCIInputNeutralTemperatureKey$kCIInputNeutralTintKey$kCIInputRadiusKey$kCIInputRefractionKey$kCIInputSaturationKey$kCIInputScaleFactorKey$kCIInputScaleKey$kCIInputShadingImageKey$kCIInputSharpnessKey$kCIInputTargetImageKey$kCIInputTimeKey$kCIInputTransformKey$kCIInputWidthKey$kCIOutputImageKey$kCISamplerAffineMatrix$kCISamplerFilterLinear$kCISamplerFilterMode$kCISamplerFilterNearest$kCISamplerWrapBlack$kCISamplerWrapClamp$kCISamplerWrapMode$kCISupportedDecoderVersionsKey$kCIUIParameterSet$kCIUISetAdvanced$kCIUISetBasic$kCIUISetDevelopment$kCIUISetIntermediate$'''
+constants = '''$kCIOutputNativeSizeKey$kCAValueFunctionRotateX$kCAValueFunctionRotateY$kCAValueFunctionRotateZ$kCAValueFunctionScale$kCAValueFunctionScaleX$kCAValueFunctionScaleY$kCAValueFunctionScaleZ$kCAValueFunctionTranslate$kCAValueFunctionTranslateX$kCAValueFunctionTranslateY$kCAValueFunctionTranslateZ$kCATransactionAnimationTimingFunction$kCATransactionCompletionBlock$kCAMediaTimingFunctionDefault$kCAFillRuleNonZero$kCAFillRuleEvenOdd$kCALineJoinMiter$kCALineJoinRound$kCALineJoinRound$kCALineCapButt$kCALineCapRound$kCALineCapSquare$kCAFilterTrilinear$kCAGradientLayerAxial$kCAEmitterLayerPoint$kCAEmitterLayerLine$kCAEmitterLayerRectangle$kCAEmitterLayerCuboid$kCAEmitterLayerCircle$kCAEmitterLayerSphere$kCAEmitterLayerPoints$kCAEmitterLayerOutline$kCAEmitterLayerSurface$kCAEmitterLayerVolume$kCAEmitterLayerUnordered$kCAEmitterLayerOldestFirst$kCAEmitterLayerOldestLast$kCAEmitterLayerBackToFront$kCAEmitterLayerAdditive$kCAAlignmentCenter$kCAAlignmentJustified$kCAAlignmentLeft$kCAAlignmentNatural$kCAAlignmentRight$kCAAnimationDiscrete$kCAAnimationLinear$kCAAnimationPaced$kCAAnimationRotateAuto$kCAAnimationRotateAutoReverse$kCAFillModeBackwards$kCAFillModeBoth$kCAFillModeForwards$kCAFillModeFrozen$kCAFillModeRemoved$kCAFilterLinear$kCAFilterNearest$kCAGravityBottom$kCAGravityBottomLeft$kCAGravityBottomRight$kCAGravityCenter$kCAGravityLeft$kCAGravityResize$kCAGravityResizeAspect$kCAGravityResizeAspectFill$kCAGravityRight$kCAGravityTop$kCAGravityTopLeft$kCAGravityTopRight$kCAMediaTimingFunctionEaseIn$kCAMediaTimingFunctionEaseInEaseOut$kCAMediaTimingFunctionEaseOut$kCAMediaTimingFunctionLinear$kCAOnOrderIn$kCAOnOrderOut$kCAScrollBoth$kCAScrollHorizontally$kCAScrollNone$kCAScrollVertically$kCATransactionAnimationDuration$kCATransactionDisableActions$kCATransition$kCATransitionFade$kCATransitionFromBottom$kCATransitionFromLeft$kCATransitionFromRight$kCATransitionFromTop$kCATransitionMoveIn$kCATransitionPush$kCATransitionReveal$kCATruncationEnd$kCATruncationMiddle$kCATruncationNone$kCATruncationStart$kCIApplyOptionDefinition$kCIApplyOptionExtent$kCIApplyOptionUserInfo$kCIAttributeClass$kCIAttributeDefault$kCIAttributeDescription$kCIAttributeDisplayName$kCIAttributeFilterCategories$kCIAttributeFilterDisplayName$kCIAttributeFilterName$kCIAttributeIdentity$kCIAttributeMax$kCIAttributeMin$kCIAttributeName$kCIAttributeReferenceDocumentation$kCIAttributeSliderMax$kCIAttributeSliderMin$kCIAttributeType$kCIAttributeTypeAngle$kCIAttributeTypeBoolean$kCIAttributeTypeCount$kCIAttributeTypeDistance$kCIAttributeTypeGradient$kCIAttributeTypeInteger$kCIAttributeTypeOffset$kCIAttributeTypeOpaqueColor$kCIAttributeTypePosition$kCIAttributeTypePosition3$kCIAttributeTypeRectangle$kCIAttributeTypeScalar$kCIAttributeTypeTime$kCICategoryBlur$kCICategoryBuiltIn$kCICategoryColorAdjustment$kCICategoryColorEffect$kCICategoryCompositeOperation$kCICategoryDistortionEffect$kCICategoryFilterGenerator$kCICategoryGenerator$kCICategoryGeometryAdjustment$kCICategoryGradient$kCICategoryHalftoneEffect$kCICategoryHighDynamicRange$kCICategoryInterlaced$kCICategoryNonSquarePixels$kCICategoryReduction$kCICategorySharpen$kCICategoryStillImage$kCICategoryStylize$kCICategoryTileEffect$kCICategoryTransition$kCICategoryVideo$kCIContextOutputColorSpace$kCIContextUseSoftwareRenderer$kCIContextWorkingColorSpace$kCIFilterGeneratorExportedKey$kCIFilterGeneratorExportedKeyName$kCIFilterGeneratorExportedKeyTargetObject$kCIFormatARGB8@i$kCIFormatRGBA16@i$kCIFormatRGBAf@i$kCIImageColorSpace$kCIImageProviderTileSize$kCIImageProviderUserInfo$kCIInputAllowDraftModeKey$kCIInputAngleKey$kCIInputAspectRatioKey$kCIInputBackgroundImageKey$kCIInputBiasKey$kCIInputBoostKey$kCIInputBoostShadowAmountKey$kCIInputBrightnessKey$kCIInputCenterKey$kCIInputColorKey$kCIInputContrastKey$kCIInputDecoderVersionKey$kCIInputEVKey$kCIInputEnableChromaticNoiseTrackingKey$kCIInputEnableSharpeningKey$kCIInputExtentKey$kCIInputGradientImageKey$kCIInputIgnoreImageOrientationKey$kCIInputImageKey$kCIInputImageOrientationKey$kCIInputIntensityKey$kCIInputMaskImageKey$kCIInputNeutralChromaticityXKey$kCIInputNeutralChromaticityYKey$kCIInputNeutralLocationKey$kCIInputNeutralTemperatureKey$kCIInputNeutralTintKey$kCIInputRadiusKey$kCIInputRefractionKey$kCIInputSaturationKey$kCIInputScaleFactorKey$kCIInputScaleKey$kCIInputShadingImageKey$kCIInputSharpnessKey$kCIInputTargetImageKey$kCIInputTimeKey$kCIInputTransformKey$kCIInputWidthKey$kCIOutputImageKey$kCISamplerAffineMatrix$kCISamplerFilterLinear$kCISamplerFilterMode$kCISamplerFilterNearest$kCISamplerWrapBlack$kCISamplerWrapClamp$kCISamplerWrapMode$kCISupportedDecoderVersionsKey$kCIUIParameterSet$kCIUISetAdvanced$kCIUISetBasic$kCIUISetDevelopment$kCIUISetIntermediate$'''
+constants_dict = {'CATransform3DIdentity': sel32or64('{CATransform3D=ffffffffffffffff}', '{CATransform3D=dddddddddddddddd}')}
 enums = '''$CA_WARN_DEPRECATED@1$kCAConstraintHeight@7$kCAConstraintMaxX@2$kCAConstraintMaxY@6$kCAConstraintMidX@1$kCAConstraintMidY@5$kCAConstraintMinX@0$kCAConstraintMinY@4$kCAConstraintWidth@3$kCALayerBottomEdge@4$kCALayerHeightSizable@16$kCALayerLeftEdge@1$kCALayerMaxXMargin@4$kCALayerMaxYMargin@32$kCALayerMinXMargin@1$kCALayerMinYMargin@8$kCALayerNotSizable@0$kCALayerRightEdge@2$kCALayerTopEdge@8$kCALayerWidthSizable@2$'''
 misc.update({'CGFLOAT_MAX': sel32or64(3.4028234663852886e+38, 1.7976931348623157e+308), 'CGFLOAT_MIN': sel32or64(1.1754943508222875e-38, 2.2250738585072014e-308)})
 misc.update({})

pyobjc-framework-Quartz/Lib/Quartz/QuartzFilters/_metadata.py

 # Generated file, don't edit
 # Source: BridgeSupport/QuartzFilters.bridgesupport
-# Last update: Thu Jul 21 17:06:27 2011
+# Last update: Sun Jul 24 21:38:05 2011
 
 import objc, sys
 

pyobjc-framework-Quartz/Lib/Quartz/QuickLookUI/_metadata.py

 # Generated file, don't edit
 # Source: BridgeSupport/QuickLookUI.bridgesupport
-# Last update: Thu Jul 21 17:06:28 2011
+# Last update: Sun Jul 24 21:38:06 2011
 
 import objc, sys
 

pyobjc-framework-Quartz/Lib/Quartz/__init__.py

         pass
 
     try:
+        from Quartz import ImageKit as m
+        submods.append(m)
+        mod.ImageIO = m
+    except ImportError:
+        pass
+
+    try:
         from Quartz import CoreVideo as m
         submods.append(m)
         mod.CoreVideo = m

pyobjc-framework-Quartz/Modules/_callbacks.m

 
 	PyObject* retval = PyObjC_ObjCToPython(
 			@encode(CGDataProviderRef), &result);
-	printf("%s %d\n", __FILE__, __LINE__);
 	CFRelease(result);
-	printf("%s %d\n", __FILE__, __LINE__);
 	return retval;
 }