move foundation import to .run

samizdatco · samizdatco · commit a17ebdee0caa · 2022-06-27T15:41:31.000-04:00
- inexplicably it cuts startup time in half
diff --git a/plotdevice/lib/cocoa.py b/plotdevice/lib/cocoa.py
@@ -46,7 +46,15 @@
                    NSToolbarItem, NSTrackingActiveInActiveApp, NSTrackingArea, NSTrackingMouseEnteredAndExited, \
                    NSUnboldFontMask, NSUnitalicFontMask, NSUnionRect, NSView, NSViewFrameDidChangeNotification, \
                    NSWindow, NSWindowBackingLocationVideoMemory, NSWindowController, NSWorkspace, NSKernAttributeName
-from Foundation import *
+from Foundation import CIAffineTransform, CIColorMatrix, CIContext, CIFilter, CIImage, \
+                   CIVector, Foundation, NO, NSAffineTransform, NSAffineTransformStruct, \
+                   NSAttributedString, NSAutoreleasePool, NSBundle, NSData, NSDate, NSDateFormatter, \
+                   NSFileCoordinator, NSFileHandle, NSFileHandleDataAvailableNotification, NSIntersectionRange, \
+                   NSHeight, NSInsetRect, NSIntersectionRect, NSLocale, NSLog, NSMacOSRomanStringEncoding, \
+                   NSMakeRange, NSMidX, NSMidY, NSMutableAttributedString, NSMutableData, NSNotificationCenter, NSObject,\
+                   NSOffsetRect, NSOperationQueue, NSPoint, NSRect, NSRectFromString, NSSelectorFromString, \
+                   NSSize, NSString, NSStringFromRect, NSTimeZone, NSTimer, NSURL, NSUserDefaults, \
+                   NSUTF8StringEncoding, NSWidth
 from LaunchServices import kUTTypePNG, kUTTypeJPEG, kUTTypeGIF, kUTTypeTIFF
 from WebKit import WebView
 from objc import IBOutlet, IBAction
diff --git a/plotdevice/lib/io.py b/plotdevice/lib/io.py
@@ -1,5 +1,4 @@
 import objc, os, re
-# from Foundation import *
 
 import cIO
 for cls in ["AnimatedGif", "Pages", "SysAdmin", "Video"]:
diff --git a/plotdevice/run/__init__.py b/plotdevice/run/__init__.py
@@ -1,10 +1,10 @@
 import sys, site
-from os.path import abspath, dirname, relpath, exists, join
+from os.path import abspath, dirname, exists, join
 from subprocess import call, getoutput
 
 try:
     # test the sys.path by attempting to load a PyObjC submodule...
-    import objc
+    from Foundation import *
 except ImportError:
     deps_dir = join(dirname(__file__), '../../app/deps')
     if exists(deps_dir):
@@ -26,12 +26,10 @@
         # use the venv's site directory
         site_path = getoutput('%s/bin/python3 -c "import site; print(site.getsitepackages()[0])"' % venv_dir)
         site.addsitedir(site_path)
-        import objc
+        from Foundation import *
     else:
         from pprint import pformat
         missing = "Searched for PyObjC libraries in:\n%s\nto no avail..."%pformat(sys.path)
-        if exists('%s/../../app/info.plist'%dirname(__file__)):
-            missing += '\n\nBuild the plotdevice module with `python setup.py build\' before attempting import it.'
         raise RuntimeError(missing)
 
 # pull in the encoding-pragma detector

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import objc, os, re`
`2`		`-# from Foundation import *`
`3`	`2`
`4`	`3`	`import cIO`
`5`	`4`	`for cls in ["AnimatedGif", "Pages", "SysAdmin", "Video"]:`