[Python-checkins] CVS: python/dist/src/Tools/i18n pygettext.py,1.20,1.20.2.1
Tim Peters
tim_one@users.sourceforge.net
Fri, 27 Jul 2001 22:03:02 -0700
- Previous message: [Python-checkins] CVS: python/dist/src/RISCOS/Modules getpath_riscos.c,1.1,1.1.6.1
- Next message: [Python-checkins] CVS: python/dist/src/Python atof.c,2.7,2.7.8.1 bltinmodule.c,2.198.2.9,2.198.2.10 fmod.c,2.13,2.13.8.1 frozenmain.c,2.25,2.25.8.1 getmtime.c,2.16,2.16.6.1 hypot.c,2.3,2.3.8.1 import.c,2.176.2.3,2.176.2.4 pyfpe.c,2.6,2.6.8.1 pythonrun.c,2.133.4.5,2.133.4.6 strtod.c,1.10,1.10.8.1 sysmodule.c,2.85.4.2,2.85.4.3 thread.c,2.36,2.36.8.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Tools/i18n
In directory usw-pr-cvs1:/tmp/cvs-serv14630/descr/dist/src/Tools/i18n
Modified Files:
Tag: descr-branch
pygettext.py
Log Message:
Merge of trunk tags date2001-07-21 to date2001-07-28.
Index: pygettext.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/i18n/pygettext.py,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -d -r1.20 -r1.20.2.1
*** pygettext.py 2001/06/20 19:41:40 1.20
--- pygettext.py 2001/07/28 05:03:00 1.20.2.1
***************
*** 1,4 ****
#! /usr/bin/env python
! # Originally written by Barry Warsaw <barry@digicool.com>
#
# Minimally patched to make it even more xgettext compatible
--- 1,4 ----
#! /usr/bin/env python
! # Originally written by Barry Warsaw <barry@zope.com>
#
# Minimally patched to make it even more xgettext compatible
***************
*** 50,58 ****
-a
--extract-all
! Extract all strings
-d name
--default-domain=name
! Rename the default output file from messages.pot to name.pot
-E
--- 50,58 ----
-a
--extract-all
! Extract all strings.
-d name
--default-domain=name
! Rename the default output file from messages.pot to name.pot.
-E
***************
*** 64,72 ****
Extract module, class, method, and function docstrings. These do not
need to be wrapped in _() markers, and in fact cannot be for Python to
! consider them docstrings.
-h
--help
! print this help message and exit
-k word
--- 64,72 ----
Extract module, class, method, and function docstrings. These do not
need to be wrapped in _() markers, and in fact cannot be for Python to
! consider them docstrings. (See also the -X option).
-h
--help
! Print this help message and exit.
-k word
***************
*** 129,134 ****
appear on a line by itself in the file.
! If `inputfile' is -, standard input is read.
"""
--- 129,139 ----
appear on a line by itself in the file.
! -X filename
! --no-docstrings=filename
! Specify a file that contains a list of files (one per line) that
! should not have their docstrings extracted. This is only useful in
! conjunction with the -D option above.
+ If `inputfile' is -, standard input is read.
"""
***************
*** 147,151 ****
def _(s): return s
! __version__ = '1.3'
default_keywords = ['_']
--- 152,156 ----
def _(s): return s
! __version__ = '1.4'
default_keywords = ['_']
***************
*** 156,161 ****
! # The normal pot-file header. msgmerge and EMACS' po-mode work better if
! # it's there.
pot_header = _('''\
# SOME DESCRIPTIVE TITLE.
--- 161,166 ----
! # The normal pot-file header. msgmerge and Emacs's po-mode work better if it's
! # there.
pot_header = _('''\
# SOME DESCRIPTIVE TITLE.
***************
*** 248,251 ****
--- 253,257 ----
self.__lineno = -1
self.__freshmodule = 1
+ self.__curfile = None
def __call__(self, ttype, tstring, stup, etup, line):
***************
*** 257,262 ****
def __waiting(self, ttype, tstring, lineno):
# Do docstring extractions, if enabled
! if self.__options.docstrings:
# module docstring?
if self.__freshmodule:
--- 263,269 ----
def __waiting(self, ttype, tstring, lineno):
+ opts = self.__options
# Do docstring extractions, if enabled
! if opts.docstrings and not opts.nodocstrings.get(self.__curfile):
# module docstring?
if self.__freshmodule:
***************
*** 271,275 ****
self.__state = self.__suiteseen
return
! if ttype == tokenize.NAME and tstring in self.__options.keywords:
self.__state = self.__keywordseen
--- 278,282 ----
self.__state = self.__suiteseen
return
! if ttype == tokenize.NAME and tstring in opts.keywords:
self.__state = self.__keywordseen
***************
*** 319,322 ****
--- 326,330 ----
def set_filename(self, filename):
self.__curfile = filename
+ self.__freshmodule = 1
def write(self, fp):
***************
*** 384,393 ****
opts, args = getopt.getopt(
sys.argv[1:],
! 'ad:DEhk:Kno:p:S:Vvw:x:',
['extract-all', 'default-domain=', 'escape', 'help',
'keyword=', 'no-default-keywords',
'add-location', 'no-location', 'output=', 'output-dir=',
'style=', 'verbose', 'version', 'width=', 'exclude-file=',
! 'docstrings',
])
except getopt.error, msg:
--- 392,401 ----
opts, args = getopt.getopt(
sys.argv[1:],
! 'ad:DEhk:Kno:p:S:Vvw:x:X:',
['extract-all', 'default-domain=', 'escape', 'help',
'keyword=', 'no-default-keywords',
'add-location', 'no-location', 'output=', 'output-dir=',
'style=', 'verbose', 'version', 'width=', 'exclude-file=',
! 'docstrings', 'no-docstrings',
])
except getopt.error, msg:
***************
*** 411,414 ****
--- 419,423 ----
excludefilename = ''
docstrings = 0
+ nodocstrings = {}
options = Options()
***************
*** 457,460 ****
--- 466,479 ----
elif opt in ('-x', '--exclude-file'):
options.excludefilename = arg
+ elif opt in ('-X', '--no-docstrings'):
+ fp = open(arg)
+ try:
+ while 1:
+ line = fp.readline()
+ if not line:
+ break
+ options.nodocstrings[line[:-1]] = 1
+ finally:
+ fp.close()
# calculate escapes
- Previous message: [Python-checkins] CVS: python/dist/src/RISCOS/Modules getpath_riscos.c,1.1,1.1.6.1
- Next message: [Python-checkins] CVS: python/dist/src/Python atof.c,2.7,2.7.8.1 bltinmodule.c,2.198.2.9,2.198.2.10 fmod.c,2.13,2.13.8.1 frozenmain.c,2.25,2.25.8.1 getmtime.c,2.16,2.16.6.1 hypot.c,2.3,2.3.8.1 import.c,2.176.2.3,2.176.2.4 pyfpe.c,2.6,2.6.8.1 pythonrun.c,2.133.4.5,2.133.4.6 strtod.c,1.10,1.10.8.1 sysmodule.c,2.85.4.2,2.85.4.3 thread.c,2.36,2.36.8.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]