Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/ocx
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7676/pywin/Demos/ocx
Modified Files:
Tag: py3k
webbrowser.py
Log Message:
merge various fixes and cleanups from bzr integration branch
Index: webbrowser.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/ocx/webbrowser.py,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -d -r1.1.4.1 -r1.1.4.2
*** webbrowser.py 29 Aug 2008 06:16:06 -0000 1.1.4.1
--- webbrowser.py 3 Jan 2009 04:45:17 -0000 1.1.4.2
***************
*** 22,25 ****
--- 22,27 ----
if url is None:
self.url = regutil.GetRegisteredHelpFile("Main Python Documentation")
+ if self.url is None:
+ self.url = "http://www.python.org"
else:
self.url = url
***************
*** 44,50 ****
self.SetWindowText(title)
! def Demo():
! url = None
! if len(sys.argv)>1:
url = win32api.GetFullPathName(sys.argv[1])
f = BrowserFrame(url)
--- 46,51 ----
self.SetWindowText(title)
! def Demo(url=None):
! if url is None and len(sys.argv)>1:
url = win32api.GetFullPathName(sys.argv[1])
f = BrowserFrame(url)
***************
*** 52,54 ****
if __name__=='__main__':
! Demo()
\ No newline at end of file
--- 53,55 ----
if __name__=='__main__':
! Demo()
|
