[Checkins] SVN: zc.buildout/branches/help-api/src/zc/buildout/buildout.py white spaces
Godefroid Chapelle
gotcha at bubblenet.be
Sun Mar 29 17:30:21 EDT 2009
Log message for revision 98586:
white spaces
Changed:
U zc.buildout/branches/help-api/src/zc/buildout/buildout.py
-=-
Modified: zc.buildout/branches/help-api/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/branches/help-api/src/zc/buildout/buildout.py 2009-03-29 21:30:14 UTC (rev 98585)
+++ zc.buildout/branches/help-api/src/zc/buildout/buildout.py 2009-03-29 21:30:21 UTC (rev 98586)
@@ -104,7 +104,7 @@
user_defaults=True, windows_restart=False, command=None):
__doing__ = 'Initializing.'
-
+
self.__windows_restart = windows_restart
# default options
@@ -161,7 +161,7 @@
# because while parsing options those attributes might be
# used already (Gottfried Ganssauge)
buildout_section = data.get('buildout')
-
+
# Try to make sure we have absolute paths for standard
# directories. We do this before doing substitutions, in case
# a one of these gets read by another section. If any
@@ -178,13 +178,13 @@
allow_hosts = buildout_section and buildout_section.get(
'allow-hosts', '*').split('\n')
- self._allow_hosts = tuple([host.strip() for host in allow_hosts
+ self._allow_hosts = tuple([host.strip() for host in allow_hosts
if host.strip() != ''])
self._logger = logging.getLogger('zc.buildout')
self.offline = False
self.newest = True
-
+
##################################################################
## WARNING!!!
## ALL ATTRIBUTES MUST HAVE REASONABLE DEFAULTS AT THIS POINT
@@ -196,9 +196,9 @@
# now reinitialize
links = options.get('find-links', '')
self._links = links and links.split() or ()
-
+
allow_hosts = options.get('allow-hosts', '*').split('\n')
- self._allow_hosts = tuple([host.strip() for host in allow_hosts
+ self._allow_hosts = tuple([host.strip() for host in allow_hosts
if host.strip() != ''])
self._buildout_dir = options['directory']
@@ -240,7 +240,7 @@
self._error('Invalid value for prefer-final option: %s',
prefer_final)
zc.buildout.easy_install.prefer_final(prefer_final=='true')
-
+
use_dependency_links = options.get('use-dependency-links', 'true')
if use_dependency_links not in ('true', 'false'):
self._error('Invalid value for use-dependency-links option: %s',
@@ -267,7 +267,7 @@
download_cache = os.path.join(download_cache, 'dist')
if not os.path.isdir(download_cache):
os.mkdir(download_cache)
-
+
zc.buildout.easy_install.download_cache(download_cache)
install_from_cache = options.get('install-from-cache')
@@ -359,7 +359,7 @@
installed_develop_eggs = self._develop()
installed_part_options['buildout']['installed_develop_eggs'
] = installed_develop_eggs
-
+
if installed_exists:
self._update_installed(
installed_develop_eggs=installed_develop_eggs)
@@ -369,7 +369,7 @@
conf_parts = conf_parts and conf_parts.split() or []
installed_parts = installed_part_options['buildout']['parts']
installed_parts = installed_parts and installed_parts.split() or []
-
+
if install_args:
install_parts = install_args
uninstall_missing = False
@@ -385,11 +385,11 @@
if self._log_level < logging.DEBUG:
sections = list(self)
sections.sort()
- print
+ print
print 'Configuration data:'
for section in self._data:
_save_options(section, self[section], sys.stdout)
- print
+ print
# compute new part recipe signatures
@@ -517,7 +517,7 @@
if need_to_save_installed:
installed_part_options['buildout']['parts'] = (
- ' '.join(installed_parts))
+ ' '.join(installed_parts))
self._save_installed_options(installed_part_options)
installed_exists = True
else:
@@ -605,7 +605,7 @@
if f not in old_files
]))
raise
-
+
else:
self._sanity_check_develop_eggs_files(dest, old_files)
return '\n'.join([os.path.join(dest, f)
@@ -652,7 +652,7 @@
value = value.replace(k, v)
options[option] = value
result[section] = Options(self, section, options)
-
+
return result, True
else:
return ({'buildout': Options(self, 'buildout', {'parts': ''})},
@@ -680,8 +680,8 @@
# Sigh. This is the exectable used to run the buildout
# and, of course, it's in use. Leave it.
):
- raise
-
+ raise
+
def _install(self, part):
options = self[part]
recipe, entry = _recipe(options)
@@ -725,7 +725,7 @@
buildout_handler.setFormatter(logging.Formatter('%(message)s'))
self._logger.propagate = False
self._logger.addHandler(buildout_handler)
-
+
handler.setFormatter(logging.Formatter(log_format))
root_logger.addHandler(handler)
@@ -754,7 +754,7 @@
if not self.newest:
return
-
+
ws = zc.buildout.easy_install.install(
[
(spec + ' ' + self['buildout'].get(spec+'-version', '')).strip()
@@ -798,8 +798,8 @@
if not __debug__:
args.insert(0, '-O')
args.insert(0, zc.buildout.easy_install._safe_arg (sys.executable))
- os.execv(sys.executable, args)
-
+ os.execv(sys.executable, args)
+
self._logger.info("Upgraded:\n %s;\nrestarting.",
",\n ".join([("%s version %s"
% (dist.project_name, dist.version)
@@ -808,7 +808,7 @@
]
),
)
-
+
# the new dist is different, so we've upgraded.
# Update the scripts and return True
zc.buildout.easy_install.scripts(
@@ -878,13 +878,13 @@
))
if is_jython:
arg_list = list()
-
+
for a in args:
add_args.append(zc.buildout.easy_install._safe_arg(a))
-
+
subprocess.Popen([zc.buildout.easy_install._safe_arg(sys.executable)] + list(tsetup) +
arg_list).wait()
-
+
else:
os.spawnl(os.P_WAIT, sys.executable, zc.buildout.easy_install._safe_arg (sys.executable), tsetup,
*[zc.buildout.easy_install._safe_arg(a)
@@ -910,7 +910,7 @@
options = Options(self, section, data)
self._data[section] = options
options._initialize()
- return options
+ return options
def __setitem__(self, key, value):
raise NotImplementedError('__setitem__')
@@ -1063,7 +1063,7 @@
def _initialize(self):
name = self.name
__doing__ = 'Initializing section %s.', name
-
+
# force substitutions
for k, v in self._raw.items():
if '${' in v:
@@ -1071,11 +1071,11 @@
if self.name == 'buildout':
return # buildout section can never be a part
-
+
recipe = self.get('recipe')
if not recipe:
return
-
+
reqs, entry = _recipe(self._data)
buildout = self.buildout
recipe_class = _install_and_load(reqs, 'zc.buildout', entry, buildout)
@@ -1147,7 +1147,7 @@
"The option name in substitution, %s,\n"
"has invalid characters."
% ref)
-
+
v = self.buildout[s[0]].get(s[1], None, seen)
if v is None:
raise MissingOption("Referenced option does not exist:", *s)
@@ -1155,7 +1155,7 @@
subs.append('')
return ''.join([''.join(v) for v in zip(value[::2], subs)])
-
+
def __getitem__(self, key):
try:
return self._data[key]
@@ -1259,7 +1259,7 @@
if value.endswith('\n\t'):
value = value[:-2] + '%(__buildout_space_n__)s'
print >>f, option, '=', value
-
+
def _save_options(section, options, f):
print >>f, '[%s]' % section
items = options.items()
@@ -1324,8 +1324,8 @@
seen.pop()
return result
-
+
ignore_directories = '.svn', 'CVS'
def _dir_hash(dir):
hash = md5()
@@ -1340,7 +1340,7 @@
for name in filenames:
hash.update(open(os.path.join(dirpath, name)).read())
return hash.digest().encode('base64').strip()
-
+
def _dists_sig(dists):
result = []
for dist in dists:
@@ -1369,7 +1369,7 @@
[v for v in v1.split('\n')
if v not in v2.split('\n')]), newnote)
del s2[k]
-
+
s1.update(s2)
return s1
@@ -1399,7 +1399,7 @@
if d:
doing.append(d)
tb = tb.tb_next
-
+
if doing:
sys.stderr.write('While:\n')
for d in doing:
@@ -1456,13 +1456,13 @@
Don't read user defaults.
-o
-
- Run in off-line mode. This is equivalent to the assignment
+
+ Run in off-line mode. This is equivalent to the assignment
buildout:offline=true.
-O
- Run in non-off-line mode. This is equivalent to the assignment
+ Run in non-off-line mode. This is equivalent to the assignment
buildout:offline=false. This is the default buildout mode. The
-O option would normally be used to override a true offline
setting in a configuration file.
@@ -1476,10 +1476,10 @@
-N
- Run in non-newest mode. This is equivalent to the assignment
+ Run in non-newest mode. This is equivalent to the assignment
buildout:newest=false. With this setting, buildout will not seek
new distributions if installed distributions satisfy it's
- requirements.
+ requirements.
-D
@@ -1529,7 +1529,7 @@
The script can be given either as a script path or a path to a
directory containing a setup.py script.
-
+
"""
def _help():
print _usage
@@ -1571,7 +1571,7 @@
else:
_help()
op = op[1:]
-
+
if op[:1] in ('c', 't'):
op_ = op[:1]
op = op[1:]
@@ -1648,10 +1648,10 @@
sys.stderr.write(_internal_error_template)
traceback.print_exception(*exc_info)
sys.exit(1)
-
-
+
+
finally:
- logging.shutdown()
+ logging.shutdown()
if sys.version_info[:2] < (2, 4):
def reversed(iterable):
More information about the Checkins
mailing list