Le 23 nov. 05 à 19:10, Art Haas a écrit :
Try 'svn update'
and see what subversion does.
after svn update find attached new import adjustments :
Index: ImageWindowController.py
===================================================================
--- ImageWindowController.py (revision 2064)
+++ ImageWindowController.py (working copy)
@@ -19,17 +19,19 @@
#
# Cocoa CAD drawing window controller, delegate of split view
#
+# P.L.V. nov 23 05
+# import adjustment
import string
import PythonCAD.Generic.layer
import PythonCAD.Generic.keywords
-import CADView
-import LayerView
-import CocoaPrompt
-import Globals
-import AppController
-from Globals import WinFrameName, LayerDeletedNotification, LayerAddedNotification, ToolChangedNotification
+import PythonCAD.Interface.Cocoa.CADView
+import PythonCAD.Interface.Cocoa.LayerView
+import PythonCAD.Interface.Cocoa.CocoaPrompt
+import PythonCAD.Interface.Cocoa.Globals
+import PythonCAD.Interface.Cocoa.AppController
+from PythonCAD.Interface.Cocoa.Globals import WinFrameName, LayerDeletedNotification, LayerAddedNotification, ToolChangedNotification
from PyObjCTools import NibClassBuilder
from AppKit import *
Index: AppController.py
===================================================================
--- AppController.py (revision 2064)
+++ AppController.py (working copy)
@@ -19,17 +19,19 @@
#
# Application Controller Object (& app delegate)
#
+# P.L.V. nov 23 05
+# import adjustment
from math import hypot, pi, atan2
import objc
-from PythonCAD.Generic import tools
-from PythonCAD.Interface.Cocoa import CocoaConobjs
-from PythonCAD.Interface.Cocoa import CocoaEntities
-from PythonCAD.Interface.Cocoa import CocoaModify
-from PythonCAD.Interface.Cocoa import CocoaText
-from PythonCAD.Interface.Cocoa import CocoaDimensions
+import PythonCAD.Generic.tools
+import PythonCAD.Interface.Cocoa.CocoaConobjs
+import PythonCAD.Interface.Cocoa.CocoaEntities
+import PythonCAD.Interface.Cocoa.CocoaModify
+import PythonCAD.Interface.Cocoa.CocoaText
+import PythonCAD.Interface.Cocoa.CocoaDimensions
from PyObjCTools import NibClassBuilder
from Foundation import *
from AppKit import NSDocumentController, NSSavePanel, NSOKButton, NSCancelButton, NSPanel, NSWindowController, NSApplication, NSTextView
Index: CocoaConobjs.py
===================================================================
--- CocoaConobjs.py (revision 2064)
+++ CocoaConobjs.py (working copy)
@@ -19,11 +19,13 @@
#
# Handles creation of construction lines, circles, etc
#
+# P.L.V. nov 23 05
+# import adjustment
from math import hypot, pi, atan2
from Foundation import *
-from PythonCAD.Interface.Cocoa import CocoaEntities
+import PythonCAD.Interface.Cocoa.CocoaEntities
import PythonCAD.Generic.cline
import PythonCAD.Generic.acline
import PythonCAD.Generic.conobject
Index: CocoaEntities.py
===================================================================
--- CocoaEntities.py (revision 2064)
+++ CocoaEntities.py (working copy)
@@ -19,14 +19,16 @@
#
# Handles creation of drawing entities (circles, lines, chamfers, etc)
#
+# P.L.V. nov 23 05
+# import adjustment
import string
from math import hypot, pi, atan2
import objc
-from PythonCAD.Interface.Cocoa import Globals
-from PythonCAD.Interface.Cocoa import ImageDocument
+import PythonCAD.Interface.Cocoa.Globals
+import PythonCAD.Interface.Cocoa.ImageDocument
import PythonCAD.Generic.tools
import PythonCAD.Generic.util
with the following result at running :
Traceback (most recent call last):
File "/Users/pierreva/Documents/pythoncad2/build/PythonCad.app/
Contents/Resources/PythonCad.py", line 45, in ?
import PythonCAD.Interface.Cocoa.ImageDocument
File "/Users/pierreva/Documents/pythoncad2/build/PythonCad.app/
Contents/Resources/PythonCAD/Interface/Cocoa/ImageDocument.py", line
40, in ?
import PythonCAD.Interface.Cocoa.ImageWindowController
File "/Users/pierreva/Documents/pythoncad2/build/PythonCad.app/
Contents/Resources/PythonCAD/Interface/Cocoa/
ImageWindowController.py", line 31, in ?
import PythonCAD.Interface.Cocoa.AppController
File "/Users/pierreva/Documents/pythoncad2/build/PythonCad.app/
Contents/Resources/PythonCAD/Interface/Cocoa/AppController.py", line
28, in ?
import PythonCAD.Interface.Cocoa.CocoaConobjs
File "/Users/pierreva/Documents/pythoncad2/build/PythonCad.app/
Contents/Resources/PythonCAD/Interface/Cocoa/CocoaConobjs.py", line
26, in ?
import PythonCAD.Interface.Cocoa.CocoaEntities
File "/Users/pierreva/Documents/pythoncad2/build/PythonCad.app/
Contents/Resources/PythonCAD/Interface/Cocoa/CocoaEntities.py", line
80, in ?
Globals.s = None
NameError: name 'Globals' is not defined
Pierre
_______________________________________________
PythonCAD mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pythoncad
