Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Mostly reformatting, splitting long lines, whitespace normalization 

etc.

Fixed one typo in the __main__ section.
This commit is contained in:
Barry Warsaw 2003-04-16 18:08:23 +00:00
parent 2ed6dff796
commit e04ee70a68
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Tools/i18n/pygettext.py
View File

@ -156,7 +156,9 @@ If `inputfile' is -, standard input is read.
""") """)
import os import os
import imp
import sys import sys
import glob
import time import time
import getopt import getopt
import token import token
@ -256,19 +258,17 @@ def normalize(s):
def containsAny(str, set): def containsAny(str, set):
""" Check whether 'str' contains ANY of the chars in 'set' """Check whether 'str' contains ANY of the chars in 'set'"""
"""
return 1 in [c in str for c in set] return 1 in [c in str for c in set]
def _visit_pyfiles(list, dirname, names): def _visit_pyfiles(list, dirname, names):
""" Helper for getFilesForName(). """Helper for getFilesForName()."""
"""
# get extension for python source files # get extension for python source files
if not globals().has_key('_py_ext'): if not globals().has_key('_py_ext'):
import imp
global _py_ext global _py_ext
_py_ext = [triple[0] for triple in imp.get_suffixes() if triple[2] == imp.PY_SOURCE][0] _py_ext = [triple[0] for triple in imp.get_suffixes()
if triple[2] == imp.PY_SOURCE][0]
# don't recurse into CVS directories # don't recurse into CVS directories
if 'CVS' in names: if 'CVS' in names:
@ -276,20 +276,18 @@ def _visit_pyfiles(list, dirname, names):
# add all *.py files to list # add all *.py files to list
list.extend( list.extend(
[os.path.join(dirname, file) [os.path.join(dirname, file) for file in names
for file in names if os.path.splitext(file)[1] == _py_ext]
if os.path.splitext(file)[1] == _py_ext]) )
def _get_modpkg_path(dotted_name, pathlist=None): def _get_modpkg_path(dotted_name, pathlist=None):
""" Get the filesystem path for a module or a package. """Get the filesystem path for a module or a package.
Return the file system path to a file for a module, Return the file system path to a file for a module, and to a directory for
and to a directory for a package. Return None if a package. Return None if the name is not found, or is a builtin or
the name is not found, or is a builtin or extension module. extension module.
""" """
import imp
# split off top-most name # split off top-most name
parts = dotted_name.split('.', 1) parts = dotted_name.split('.', 1)
@ -310,8 +308,10 @@ def _get_modpkg_path(dotted_name, pathlist=None):
else: else:
# plain name # plain name
try: try:
file, pathname, description = imp.find_module(dotted_name, pathlist) file, pathname, description = imp.find_module(
if file: file.close() dotted_name, pathlist)
if file:
file.close()
if description[2] not in [imp.PY_SOURCE, imp.PKG_DIRECTORY]: if description[2] not in [imp.PY_SOURCE, imp.PKG_DIRECTORY]:
pathname = None pathname = None
except ImportError: except ImportError:
@ -321,15 +321,12 @@ def _get_modpkg_path(dotted_name, pathlist=None):
def getFilesForName(name): def getFilesForName(name):
""" Get a list of module files for a filename, a module or package name, """Get a list of module files for a filename, a module or package name,
or a directory. or a directory.
""" """
import imp
if not os.path.exists(name): if not os.path.exists(name):
# check for glob chars # check for glob chars
if containsAny(name, "*?[]"): if containsAny(name, "*?[]"):
import glob
files = glob.glob(name) files = glob.glob(name)
list = [] list = []
for file in files: for file in files:
@ -426,8 +423,13 @@ class TokenEater:
elif ttype not in [tokenize.COMMENT, token.INDENT, token.DEDENT, elif ttype not in [tokenize.COMMENT, token.INDENT, token.DEDENT,
token.NEWLINE, tokenize.NL]: token.NEWLINE, tokenize.NL]:
# warn if we see anything else than STRING or whitespace # warn if we see anything else than STRING or whitespace
print >>sys.stderr, _('*** %(file)s:%(lineno)s: Seen unexpected token "%(token)s"') % { print >> sys.stderr, _(
'token': tstring, 'file': self.__curfile, 'lineno': self.__lineno} '*** %(file)s:%(lineno)s: Seen unexpected token "%(token)s"'
) % {
'token': tstring,
'file': self.__curfile,
'lineno': self.__lineno
}
self.__state = self.__waiting self.__state = self.__waiting
def __addentry(self, msg, lineno=None, isdocstring=0): def __addentry(self, msg, lineno=None, isdocstring=0):
@ -662,6 +664,6 @@ if __name__ == '__main__':
main() main()
# some more test strings # some more test strings
_(u'a unicode string') _(u'a unicode string')
_('*** Seen unexpected token "%(token)s"' % {'token': 'test'}) # this one creates a warning # this one creates a warning
_('*** Seen unexpected token "%(token)s"') % {'token': 'test'}
_('more' 'than' 'one' 'string') _('more' 'than' 'one' 'string')