Changeset 358 for WingDBG/trunk/WingDBG.py

Timestamp:

07/31/07 10:09:19 (5 years ago)

Author:

mj

Message:

Merge Wing 3b1 changes.

Files:

• WingDBG/trunk/WingDBG.py (modified) (9 diffs)

WingDBG/trunk/WingDBG.py

@@ -27 +27 @@
 __doc__ = """Wing Debugger Service Module"""
 
-__version__ = '2.1.0'
+__version__ = '3.0.0'
 
 
@@ -68 +68 @@
         
         self.reason = reason
+        sys.stderr.write(reason + '\n')
         
 class IDEConnectionTimeOut(Exception):
@@ -165 +166 @@
     def __init__(self): 
         if sys.platform == 'win32':
-            self.wing_home = r'c:\Program Files\Wing IDE 2.1'
+            self.wing_home = r'c:\Program Files\Wing IDE 3.0'
         elif sys.platform.startswith('darwin'):
             self.wing_home = '/Applications/WingIDE.app/Contents/MacOS'
         else:
-            self.wing_home = '/usr/lib/wingide2.1'
+            self.wing_home = '/usr/lib/wingide3.0'
         
         winghome_file = os.path.join(PRODUCT_DIR, '.winghome')
@@ -234 +235 @@
     security.declareProtected(VIEW_PERMISSION, 'wingDebugPwIsValid')
     def wingDebugPwIsValid(self):
-        """Return true if .wingdebugpw can be found"""
+        """Return true if wingdebugpw can be found"""
         dir = self.getProfileDir()
-        return dir and os.path.isfile(os.path.join(dir, '.wingdebugpw'))
+        return dir and os.path.isfile(os.path.join(dir, 'wingdebugpw'))
 
     #
@@ -316 +317 @@
             gHttpServer.RunOnDebugThread(cb)
             
-            # Wait up to 3 seconds for connection
+            # Wait up for connection
             start_time = time.time()
             while time.time() < start_time + 5 and not status['completed']:
@@ -335 +336 @@
             raise CannotStartDebugger('Cannot find wingdb.py in $(WINGHOME)/src or'
                                      ' $(WINGHOME)/bin')
-            
+        
+        try:
+            exec_dict = {}
+            execfile(os.path.join(winghome, 'bin', '_patchsupport.py'), exec_dict)
+            find_matching = exec_dict['FindMatching']
+            dir_list = find_matching('bin', internal_home, user_settings=None)
+        except Exception:
+            dir_list = []
+
+        dir_list.extend([os.path.join(internal_home, 'bin'), 
+                         os.path.join(internal_home, 'src')])
         wingdb = None
-        for path in [os.path.join(internal_home, 'bin'), 
-                     os.path.join(internal_home, 'src')]:
+        for path in dir_list:
             try:
                 f, p, d = imp.find_module('wingdb', [path])
@@ -371 +381 @@
         tracer.set_always_stop_excepts(())
         tracer.set_never_stop_excepts(())
+        
+        # Stop tracing
+        tracer.stop_trace()
+        
         # Unload modules
         for name in ('wingdb', 'netserver'):
@@ -434 +448 @@
                    ' Advanced Settings page.')
             if pw_path: # Always either empty or length 1
-               pathname = os.path.join(pw_path[0], '.wingdebugpw')
+               pathname = os.path.join(pw_path[0], 'wingdebugpw')
                if not os.access(pathname, os.R_OK):
                    msg = ('Cannot create debugger because "%s"'
                           ' cannot be read.\nPlease make sure the user %s'
                           ' can read the file or change the directory that'
-                          ' .wingdebugpw is read from via the Connection'
+                          ' wingdebugpw is read from via the Connection'
                           ' Security options in the Advanced Settings page.' 
                           % (pathname, getUsername(gNetServer) or '<unknown>'))
@@ -669 +683 @@
     def getDisplayValue(self, field, value):
         if field == 'pw_mode':
-            return ('From $WINGHOME', 'From custom directory', 
+            return ('From User Settings Directory', 'From custom directory', 
                     'Custom password and scrambling mode')[value]
         if field == 'custom_encrypt_type':