[PyWebMail-Checkins] webmail pop3mgr.pyw,NONE,1.1 wget_gui.pyw,NONE,1.1 MANIFEST.in,1.1.1.1,1.2 setu
Status: Beta
Brought to you by:
dubnerm
Menu
▾
▴
[PyWebMail-Checkins] webmail pop3mgr.pyw,NONE,1.1 wget_gui.pyw,NONE,1.1 MANIFEST.in,1.1.1.1,1.2 setup.py,1.1.1.1,1.2 setup_py2exe.py,1.1.1.1,1.2 wget_nt.py,1.1.1.1,1.2 wmail_nt.py,1.1.1.1,1.2 CHANGES.txt,1.1.1.1,1.2 COPYING.txt,1.1.1.1,1.2 HISTORY.txt,1.1.1.1,1.2 wget_gui.py,1.1.1.1,NONE pop3mgr.py,1.1.1.1,NONE
|
From: <du...@us...> - 2003-06-05 02:30:25
|
Update of /cvsroot/pywebmail/webmail
In directory sc8-pr-cvs1:/tmp/cvs-serv29961
Modified Files:
MANIFEST.in setup.py setup_py2exe.py wget_nt.py wmail_nt.py
CHANGES.txt COPYING.txt HISTORY.txt
Added Files:
pop3mgr.pyw wget_gui.pyw
Removed Files:
wget_gui.py pop3mgr.py
Log Message:
Version 0.9 (see HISTORY.txt)
--- NEW FILE: pop3mgr.pyw ---
#!/usr/bin/env wpythonw
import sys
import logging
import islib, islib.xlogging
log = logging.getLogger('pop3mgr')
try:
islib.main_setup()
except:
islib.xlogging.force_display()
log.exception("Fatal error")
if __name__ == '__main__':
try:
import webmail.client.manager.pop3
webmail.client.manager.pop3.main(sys.argv)
except:
islib.xlogging.force_display()
log.exception("Can't proceed")
--- NEW FILE: wget_gui.pyw ---
#!/usr/bin/env wpythonw
import sys
import logging
import islib, islib.xlogging
log = logging.getLogger('wget_gui')
try:
islib.main_setup()
except:
islib.xlogging.force_display()
log.exception("Fatal error")
if __name__ == '__main__':
try:
import webmail.client.manager.local
webmail.client.manager.local.main(sys.argv)
except:
islib.xlogging.force_display()
log.exception("Can't proceed")
Index: MANIFEST.in
===================================================================
RCS file: /cvsroot/pywebmail/webmail/MANIFEST.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MANIFEST.in 28 May 2003 04:43:10 -0000 1.1.1.1
--- MANIFEST.in 5 Jun 2003 02:30:19 -0000 1.2
***************
*** 10,15 ****
include wgetpop3.py
include wget_nt.py
! include wget_gui.py
! include pop3mgr.py
include setup.py
include setup_py2exe.py
--- 10,15 ----
include wgetpop3.py
include wget_nt.py
! include wget_gui.pyw
! include pop3mgr.pyw
include setup.py
include setup_py2exe.py
Index: setup.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/setup.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** setup.py 28 May 2003 04:43:10 -0000 1.1.1.1
--- setup.py 5 Jun 2003 02:30:19 -0000 1.2
***************
*** 3,6 ****
--- 3,19 ----
from distutils.core import setup, Extension
from distutils.sysconfig import get_python_lib
+ try:
+ import py2exe
+ except:
+ pass
+ else:
+ import setup_py2exe
+ try:
+ import distutils.command.bdist
+ distutils.command.bdist.bdist.default_format['posix'] = 'bztar'
+ import distutils.command.bdist_dumb
+ distutils.command.bdist_dumb.bdist_dumb.default_format['posix'] = 'bztar'
+ except:
+ pass
description = "Misc helpful modules"
***************
*** 17,21 ****
readme = description
config_dir = os.path.join("webmail", "client", "config")
! config_files = [os.path.join(config_dir,f) for f in ["local.xml", "Mail.Com.xml", "Yahoo.xml"]]
config_dir = os.path.join(get_python_lib(prefix=''), config_dir)
version = "0.0"
--- 30,35 ----
readme = description
config_dir = os.path.join("webmail", "client", "config")
! config_files = filter(lambda f:os.path.splitext(f)[1].lower()=='.xml', os.listdir(config_dir))
! config_files = map(lambda f:os.path.join(config_dir,f), config_files)
config_dir = os.path.join(get_python_lib(prefix=''), config_dir)
version = "0.0"
***************
*** 31,38 ****
description=description,
long_description=long_description,
! license="Free BSD Artistic License",
platforms="Python",
! scripts=["wgetmail.py", "wget_nt.py", "wget_gui.py", "wgetpop3.py",
! "pop3mgr.py", "wmail_nt.py", "wmail_sa.py"],
packages=[
"webmail",
--- 45,52 ----
description=description,
long_description=long_description,
! license="Artistic License (see COPYING.txt)",
platforms="Python",
! scripts=["wgetmail.py", "wget_nt.py", "wget_gui.pyw", "wgetpop3.py",
! "pop3mgr.pyw", "wmail_nt.py", "wmail_sa.py"],
packages=[
"webmail",
***************
*** 43,46 ****
"webmail.client.config"
],
! data_files=[(config_dir, config_files)]
)
--- 57,60 ----
"webmail.client.config"
],
! data_files=[('config', config_files)]
)
Index: setup_py2exe.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/setup_py2exe.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** setup_py2exe.py 28 May 2003 04:43:10 -0000 1.1.1.1
--- setup_py2exe.py 5 Jun 2003 02:30:19 -0000 1.2
***************
*** 1,54 ****
! #!/usr/bin/env python
! import os, sys
! from distutils.core import setup, Extension
! try: import py2exe
! except: raise
! def main(argv):
! if len(argv) < 2 or argv[1][0] == '-':
! print 'Usage:', argv[0], '<script>', '<other py2exe options>'
! scripts = []
! scriptname = 'py2exe'
! if len(argv) > 1: argv.insert(1, 'py2exe')
! else:
! scripts = [argv[1]]
! scriptname = os.path.splitext(argv[1])[0]
! argv[1] = 'py2exe'
! description = "Misc helpful modules"
! try:
! f = open("README.txt","rt")
! readme = f.read()
! f.close()
! try:
! readme.replace('\n\r','\n').replace('\r\n','\n').replace('\r','\n')
! long_description = readme.split('\n\n',1)[0]
! except:
! long_description = readme
! except:
! readme = description
! try:
! import webmail.client
! version = webmail.client.__version__
! except:
! raise
! setup(name="webmail-"+scriptname, version=version,
! author="Michael P. Dubner",
! author_email="du...@mi...",
! url="http://hedgehog.da.ru/",
! description=description,
! long_description=long_description,
! license="Free BSD Artistic License",
! platforms="Python",
! scripts=scripts,
! packages=[
! "webmail",
! "webmail.server",
! "webmail.client",
! "webmail.client.manager",
! "webmail.client.pop3",
! "webmail.client.config"
! ]
! )
if __name__=='__main__':
! main(sys.argv)
--- 1,58 ----
! #!/usr/bin/env wpython
! import os
! from distutils.errors import DistutilsOptionError, DistutilsSetupError
! import py2exe
! import py2exe.build_exe
! orig_py2exe = getattr(py2exe.build_exe, 'orig_py2exe', py2exe.build_exe.py2exe)
! py2exe.build_exe.orig_py2exe = orig_py2exe
! class my_py2exe(orig_py2exe):
! user_options = orig_py2exe.user_options+[
! ('script=', None,
! 'Known scripts: wget_nt, wgetmail, wgetpop3, wget_gui, '+
! 'wmail_nt, wmail_sa, pop3mgr')
! ]
!
! def initialize_options(self):
! self.script = None
! orig_py2exe.initialize_options(self)
!
! def finalize_options(self):
! if not self.script:
! raise DistutilsOptionError, "script name required"
! self.distribution.scripts = [self.script]
! scriptname = os.path.splitext(self.script)[0]
! #self.distribution.name = "webmail-"+scriptname
! #self.distribution.metadata.name = self.distribution.name
! if scriptname == 'wget_nt':
! self.service = 'WebMailPOP3Service'
! if scriptname == 'wmail_nt':
! self.service = 'WebMailHTTPService'
! if scriptname == 'pop3mgr':
! self.windows = 1
! self.includes = 'anygui.backends.mswgui'
! if scriptname == 'wget_gui':
! self.console = 1 #for a while. Till console is only log output...
! self.includes = 'anygui.backends.mswgui'
! if os.path.exists(scriptname+'.ico'):
! self.icon = scriptname+'.ico'
! data_files = getattr(self.distribution, 'orig_data_files', self.distribution.data_files)
! self.distribution.orig_data_files = data_files
! if type(data_files) != type([]) or len(data_files) != 1:
! raise DistutilsSetupError, "invalid setup script"
! if scriptname in ['wget_nt', 'wgetmail', 'wgetpop3', 'wget_gui']:
! self.distribution.data_files = [('config', data_files[0][1])]
! else:
! self.distribution.data_files = None
! if scriptname == 'wget_gui':
! self.excludes = '_xmlplus'
! elif scriptname in ['wget_nt', 'wgetmail', 'wgetpop3']:
! self.excludes = '_xmlplus,anygui,Tkinter'
! elif scriptname in ['wmail_nt', 'wmail_sa']:
! self.excludes = 'anygui,Tkinter'
! orig_py2exe.finalize_options(self)
! py2exe.build_exe.py2exe = my_py2exe
if __name__=='__main__':
! import sys
! sys.stderr.write("It's a library, not a standalone script!\n")
Index: wget_nt.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/wget_nt.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** wget_nt.py 28 May 2003 04:43:10 -0000 1.1.1.1
--- wget_nt.py 5 Jun 2003 02:30:19 -0000 1.2
***************
*** 1,8 ****
#!/usr/bin/env wpython
! import win32serviceutil
import islib
from webmail.client.pop3.ntservice import WebMailPOP3Service
islib.main_setup()
if __name__=='__main__':
! win32serviceutil.HandleCommandLine(WebMailPOP3Service)
--- 1,36 ----
#!/usr/bin/env wpython
! import os
! import win32serviceutil, _winreg
import islib
from webmail.client.pop3.ntservice import WebMailPOP3Service
+ def customOptionHandler(opts):
+ adv_config = None
+ for opt,optarg in opts:
+ if opt == '-f':
+ adv_config = os.path.abspath(optarg)
+ if not adv_config:
+ n = WebMailPOP3Service._svc_name_
+ for f in ['webmail.cfg', 'webmail.ini', n+'.cfg', n+'.ini']:
+ t = os.path.abspath('webmail.cfg')
+ if os.path.exists(t):
+ adv_config = t
+ break
+ if adv_config:
+ try:
+ svc = 'System\\CurrentControlSet\\Services\\'+WebMailPOP3Service._svc_name_
+ key1 = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, svc, 0,
+ _winreg.KEY_CREATE_SUB_KEY|_winreg.KEY_SET_VALUE|_winreg.KEY_WRITE)
+ key2 = _winreg.CreateKey(key1, 'Parameters')
+ key1.Close()
+ _winreg.SetValueEx(key2, 'adv_config', 0, _winreg.REG_SZ, adv_config)
+ key2.Close()
+ print "adv_config =", repr(adv_config)
+ except:
+ print "Failed to setup adv_config."
+ raise
+
islib.main_setup()
if __name__=='__main__':
! win32serviceutil.HandleCommandLine(WebMailPOP3Service,
! customInstallOptions="f:", customOptionHandler=customOptionHandler)
Index: wmail_nt.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/wmail_nt.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** wmail_nt.py 28 May 2003 04:43:10 -0000 1.1.1.1
--- wmail_nt.py 5 Jun 2003 02:30:19 -0000 1.2
***************
*** 1,3 ****
! #!/usr/bin/env python
import win32serviceutil
import islib
--- 1,3 ----
! #!/usr/bin/env wpython
import win32serviceutil
import islib
Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/pywebmail/webmail/CHANGES.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CHANGES.txt 28 May 2003 04:43:10 -0000 1.1.1.1
--- CHANGES.txt 5 Jun 2003 02:30:19 -0000 1.2
***************
*** 1,2 ****
--- 1,10 ----
+ 2004/06/04 - Version 0.9 released
+
+ - py2exe functionality merged into setup.py from setup_py2exe.py
+
+ - bdist failures located and sneaked-back
+
+ - wgetmail.py now too uses setup files (lookup webmail.client.__init__)
+
2003/05/24 - Version 0.8 released
Index: COPYING.txt
===================================================================
RCS file: /cvsroot/pywebmail/webmail/COPYING.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** COPYING.txt 28 May 2003 04:43:10 -0000 1.1.1.1
--- COPYING.txt 5 Jun 2003 02:30:19 -0000 1.2
***************
*** 1,131 ****
!
!
!
!
! The "Artistic License"
!
! Preamble
!
! The intent of this document is to state the conditions under which a
! Package may be copied, such that the Copyright Holder maintains some
! semblance of artistic control over the development of the package,
! while giving the users of the package the right to use and distribute
! the Package in a more-or-less customary fashion, plus the right to make
! reasonable modifications.
!
! Definitions:
!
! "Package" refers to the collection of files distributed by the
! Copyright Holder, and derivatives of that collection of files
! created through textual modification.
!
! "Standard Version" refers to such a Package if it has not been
! modified, or has been modified in accordance with the wishes
! of the Copyright Holder as specified below.
!
! "Copyright Holder" is whoever is named in the copyright or
! copyrights for the package.
!
! "You" is you, if you're thinking about copying or distributing
! this Package.
!
! "Reasonable copying fee" is whatever you can justify on the
! basis of media cost, duplication charges, time of people involved,
! and so on. (You will not be required to justify it to the
! Copyright Holder, but only to the computing community at large
! as a market that must bear the fee.)
!
! "Freely Available" means that no fee is charged for the item
! itself, though there may be fees involved in handling the item.
! It also means that recipients of the item may redistribute it
! under the same conditions they received it.
!
! 1. You may make and give away verbatim copies of the source form of the
! Standard Version of this Package without restriction, provided that you
! duplicate all of the original copyright notices and associated disclaimers.
!
! 2. You may apply bug fixes, portability fixes and other modifications
! derived from the Public Domain or from the Copyright Holder. A Package
! modified in such a way shall still be considered the Standard Version.
!
! 3. You may otherwise modify your copy of this Package in any way, provided
! that you insert a prominent notice in each changed file stating how and
! when you changed that file, and provided that you do at least ONE of the
! following:
!
! a) place your modifications in the Public Domain or otherwise make them
! Freely Available, such as by posting said modifications to Usenet or
! an equivalent medium, or placing the modifications on a major archive
! site such as uunet.uu.net, or by allowing the Copyright Holder to include
! your modifications in the Standard Version of the Package.
!
! b) use the modified Package only within your corporation or organization.
!
! c) rename any non-standard executables so the names do not conflict
! with standard executables, which must also be provided, and provide
! a separate manual page for each non-standard executable that clearly
! documents how it differs from the Standard Version.
!
! d) make other distribution arrangements with the Copyright Holder.
!
! 4. You may distribute the programs of this Package in object code or
! executable form, provided that you do at least ONE of the following:
!
! a) distribute a Standard Version of the executables and library files,
! together with instructions (in the manual page or equivalent) on where
! to get the Standard Version.
!
! b) accompany the distribution with the machine-readable source of
! the Package with your modifications.
!
! c) give non-standard executables non-standard names, and clearly
! document the differences in manual pages (or equivalent), together
! with instructions on where to get the Standard Version.
!
! d) make other distribution arrangements with the Copyright Holder.
!
! 5. You may charge a reasonable copying fee for any distribution of this
! Package. You may charge any fee you choose for support of this
! Package. You may not charge a fee for this Package itself. However,
! you may distribute this Package in aggregate with other (possibly
! commercial) programs as part of a larger (possibly commercial) software
! distribution provided that you do not advertise this Package as a
! product of your own. You may embed this Package's interpreter within
! an executable of yours (by linking); this shall be construed as a mere
! form of aggregation, provided that the complete Standard Version of the
! interpreter is so embedded.
!
! 6. The scripts and library files supplied as input to or produced as
! output from the programs of this Package do not automatically fall
! under the copyright of this Package, but belong to whoever generated
! them, and may be sold commercially, and may be aggregated with this
! Package. If such scripts or library files are aggregated with this
! Package via the so-called "undump" or "unexec" methods of producing a
! binary executable image, then distribution of such an image shall
! neither be construed as a distribution of this Package nor shall it
! fall under the restrictions of Paragraphs 3 and 4, provided that you do
! not represent such an executable image as a Standard Version of this
! Package.
!
! 7. C subroutines (or comparably compiled subroutines in other
! languages) supplied by you and linked into this Package in order to
! emulate subroutines and variables of the language defined by this
! Package shall not be considered part of this Package, but are the
! equivalent of input as in Paragraph 6, provided these subroutines do
! not change the language in any way that would cause it to fail the
! regression tests for the language.
!
! 8. Aggregation of this Package with a commercial distribution is always
! permitted provided that the use of this Package is embedded; that is,
! when no overt attempt is made to make this Package's interfaces visible
! to the end user of the commercial distribution. Such use shall not be
! construed as a distribution of this Package.
!
! 9. The name of the Copyright Holder may not be used to endorse or promote
! products derived from this software without specific prior written permission.
!
! 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
! IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
! WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
!
! The End
--- 1,131 ----
!
!
!
!
! The "Artistic License"
!
! Preamble
!
! The intent of this document is to state the conditions under which a
! Package may be copied, such that the Copyright Holder maintains some
! semblance of artistic control over the development of the package,
! while giving the users of the package the right to use and distribute
! the Package in a more-or-less customary fashion, plus the right to make
! reasonable modifications.
!
! Definitions:
!
! "Package" refers to the collection of files distributed by the
! Copyright Holder, and derivatives of that collection of files
! created through textual modification.
!
! "Standard Version" refers to such a Package if it has not been
! modified, or has been modified in accordance with the wishes
! of the Copyright Holder as specified below.
!
! "Copyright Holder" is whoever is named in the copyright or
! copyrights for the package.
!
! "You" is you, if you're thinking about copying or distributing
! this Package.
!
! "Reasonable copying fee" is whatever you can justify on the
! basis of media cost, duplication charges, time of people involved,
! and so on. (You will not be required to justify it to the
! Copyright Holder, but only to the computing community at large
! as a market that must bear the fee.)
!
! "Freely Available" means that no fee is charged for the item
! itself, though there may be fees involved in handling the item.
! It also means that recipients of the item may redistribute it
! under the same conditions they received it.
!
! 1. You may make and give away verbatim copies of the source form of the
! Standard Version of this Package without restriction, provided that you
! duplicate all of the original copyright notices and associated disclaimers.
!
! 2. You may apply bug fixes, portability fixes and other modifications
! derived from the Public Domain or from the Copyright Holder. A Package
! modified in such a way shall still be considered the Standard Version.
!
! 3. You may otherwise modify your copy of this Package in any way, provided
! that you insert a prominent notice in each changed file stating how and
! when you changed that file, and provided that you do at least ONE of the
! following:
!
! a) place your modifications in the Public Domain or otherwise make them
! Freely Available, such as by posting said modifications to Usenet or
! an equivalent medium, or placing the modifications on a major archive
! site such as uunet.uu.net, or by allowing the Copyright Holder to include
! your modifications in the Standard Version of the Package.
!
! b) use the modified Package only within your corporation or organization.
!
! c) rename any non-standard executables so the names do not conflict
! with standard executables, which must also be provided, and provide
! a separate manual page for each non-standard executable that clearly
! documents how it differs from the Standard Version.
!
! d) make other distribution arrangements with the Copyright Holder.
!
! 4. You may distribute the programs of this Package in object code or
! executable form, provided that you do at least ONE of the following:
!
! a) distribute a Standard Version of the executables and library files,
! together with instructions (in the manual page or equivalent) on where
! to get the Standard Version.
!
! b) accompany the distribution with the machine-readable source of
! the Package with your modifications.
!
! c) give non-standard executables non-standard names, and clearly
! document the differences in manual pages (or equivalent), together
! with instructions on where to get the Standard Version.
!
! d) make other distribution arrangements with the Copyright Holder.
!
! 5. You may charge a reasonable copying fee for any distribution of this
! Package. You may charge any fee you choose for support of this
! Package. You may not charge a fee for this Package itself. However,
! you may distribute this Package in aggregate with other (possibly
! commercial) programs as part of a larger (possibly commercial) software
! distribution provided that you do not advertise this Package as a
! product of your own. You may embed this Package's interpreter within
! an executable of yours (by linking); this shall be construed as a mere
! form of aggregation, provided that the complete Standard Version of the
! interpreter is so embedded.
!
! 6. The scripts and library files supplied as input to or produced as
! output from the programs of this Package do not automatically fall
! under the copyright of this Package, but belong to whoever generated
! them, and may be sold commercially, and may be aggregated with this
! Package. If such scripts or library files are aggregated with this
! Package via the so-called "undump" or "unexec" methods of producing a
! binary executable image, then distribution of such an image shall
! neither be construed as a distribution of this Package nor shall it
! fall under the restrictions of Paragraphs 3 and 4, provided that you do
! not represent such an executable image as a Standard Version of this
! Package.
!
! 7. C subroutines (or comparably compiled subroutines in other
! languages) supplied by you and linked into this Package in order to
! emulate subroutines and variables of the language defined by this
! Package shall not be considered part of this Package, but are the
! equivalent of input as in Paragraph 6, provided these subroutines do
! not change the language in any way that would cause it to fail the
! regression tests for the language.
!
! 8. Aggregation of this Package with a commercial distribution is always
! permitted provided that the use of this Package is embedded; that is,
! when no overt attempt is made to make this Package's interfaces visible
! to the end user of the commercial distribution. Such use shall not be
! construed as a distribution of this Package.
!
! 9. The name of the Copyright Holder may not be used to endorse or promote
! products derived from this software without specific prior written permission.
!
! 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
! IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
! WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
!
! The End
Index: HISTORY.txt
===================================================================
RCS file: /cvsroot/pywebmail/webmail/HISTORY.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** HISTORY.txt 28 May 2003 04:43:10 -0000 1.1.1.1
--- HISTORY.txt 5 Jun 2003 02:30:20 -0000 1.2
***************
*** 1,2 ****
--- 1,11 ----
+ 2003/06/05: 0.9 release
+
+ This release is defined beta.
+
+ - 'setup.py' now worked as expected.
+ 'sdist', 'bdist', 'bdist_wininst' and 'py2exe' known to work on Win2K.
+
+ - 'wgetmail.py' now reads '.ini' files, so can be used for service debug.
+
2003/05/24: 0.8 release
--- wget_gui.py DELETED ---
--- pop3mgr.py DELETED ---
|