[Python-checkins] python/dist/src/Mac/Tools/IDE PackageManager.py, 1.9.4.2, 1.9.4.3 Wbase.py, 1.9.8.2, 1.9.8.3

jhylton@users.sourceforge.net jhylton at users.sourceforge.net
Sun Oct 16 07:24:36 CEST 2005


Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27718/Mac/Tools/IDE

Modified Files:
      Tag: ast-branch
	PackageManager.py Wbase.py 
Log Message:
Merge head to branch (for the last time)


Index: PackageManager.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PackageManager.py,v
retrieving revision 1.9.4.2
retrieving revision 1.9.4.3
diff -u -d -r1.9.4.2 -r1.9.4.3
--- PackageManager.py	7 Jan 2005 07:02:21 -0000	1.9.4.2
+++ PackageManager.py	16 Oct 2005 05:24:03 -0000	1.9.4.3
@@ -181,6 +181,8 @@
         filename = EasyDialogs.AskFileForOpen(typeList=("TEXT",))
         if filename:
             filename = urllib.pathname2url(filename)
+            if filename[:5] != 'file:':
+                filename = 'file:' + filename
             self.opendoc(filename)
 
     def domenu_openURL(self, *args):

Index: Wbase.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/Wbase.py,v
retrieving revision 1.9.8.2
retrieving revision 1.9.8.3
diff -u -d -r1.9.8.2 -r1.9.8.3
--- Wbase.py	7 Jan 2005 07:02:22 -0000	1.9.8.2
+++ Wbase.py	16 Oct 2005 05:24:03 -0000	1.9.8.3
@@ -128,28 +128,28 @@
             # depending on the values of l(eft), t(op), r(right) and b(ottom),
             # they mean different things:
             if l < -1:
-                # l is less than -1, this mean it measures from the *right* of it's parent
+                # l is less than -1, this mean it measures from the *right* of its parent
                 l = pr + l
             else:
-                # l is -1 or greater, this mean it measures from the *left* of it's parent
+                # l is -1 or greater, this mean it measures from the *left* of its parent
                 l = pl + l
             if t < -1:
-                # t is less than -1, this mean it measures from the *bottom* of it's parent
+                # t is less than -1, this mean it measures from the *bottom* of its parent
                 t = pb + t
             else:
-                # t is -1 or greater, this mean it measures from the *top* of it's parent
+                # t is -1 or greater, this mean it measures from the *top* of its parent
                 t = pt + t
             if r > 1:
                 # r is greater than 1, this means r is the *width* of the widget
                 r = l + r
             else:
-                # r is less than 1, this means it measures from the *right* of it's parent
+                # r is less than 1, this means it measures from the *right* of its parent
                 r = pr + r
             if b > 1:
                 # b is greater than 1, this means b is the *height* of the widget
                 b = t + b
             else:
-                # b is less than 1, this means it measures from the *bottom* of it's parent
+                # b is less than 1, this means it measures from the *bottom* of its parent
                 b = pb + b
             self._bounds = (l, t, r, b)
         if oldbounds and oldbounds <> self._bounds:



More information about the Python-checkins mailing list