Author: sebb
Date: Wed Jun 18 09:54:45 2025
New Revision: 1926538
URL: http://svn.apache.org/viewvc?rev=1926538&view=rev
Log:
Trailing spaces
Modified:
comdev/projects.apache.org/trunk/scripts/committee_info.py
comdev/projects.apache.org/trunk/scripts/cronjobs/countaccounts.py
comdev/projects.apache.org/trunk/scripts/cronjobs/errtee.py
comdev/projects.apache.org/trunk/scripts/cronjobs/generaterepos.py
comdev/projects.apache.org/trunk/scripts/cronjobs/jsonutils.py
comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py
comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
comdev/projects.apache.org/trunk/scripts/cronjobs/podlings.py
comdev/projects.apache.org/trunk/scripts/cronjobs/urlutils.py
comdev/projects.apache.org/trunk/site/edit/index.py
comdev/projects.apache.org/trunk/site/make_doap.py
Modified: comdev/projects.apache.org/trunk/scripts/committee_info.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/committee_info.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/scripts/committee_info.py (original)
+++ comdev/projects.apache.org/trunk/scripts/committee_info.py Wed Jun 18
09:54:45 2025
@@ -197,7 +197,7 @@ def committees():
def pmcdates():
dates = {}
-
+
cttes = cidata['committees']
for ent in cttes:
ctte = cttes[ent]
@@ -233,7 +233,7 @@ Return dict of ids and names
"""
def pmcnames():
names = {}
-
+
cttes = cidata['committees']
for ent in cttes:
ctte = cttes[ent]
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/countaccounts.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/countaccounts.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/scripts/cronjobs/countaccounts.py
(original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/countaccounts.py Wed Jun
18 09:54:45 2025
@@ -90,7 +90,7 @@ if now.day == 1: # Day one of month, red
tym1 = "%04u%02u" % (yesterday.year, yesterday.month)
print("Also looking for entries for %s" % tym1)
js[ym1] = 0
-
+
ldappeople =
loadJson('https://whimsy.apache.org/public/public_ldap_people.json')['people']
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/errtee.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/errtee.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/scripts/cronjobs/errtee.py (original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/errtee.py Wed Jun 18
09:54:45 2025
@@ -12,7 +12,7 @@
lua -l name require library 'name'
Thus the module has to be explicitly imported by the user script,
and the user must defing the 'ERRTEE' environment variable to enable it
-
+
"""
import sys
import os
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/generaterepos.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/generaterepos.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/scripts/cronjobs/generaterepos.py
(original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/generaterepos.py Wed Jun
18 09:54:45 2025
@@ -49,7 +49,7 @@ try:
gitResponse = requests.get("https://gitbox.apache.org/repositories.json",
timeout=120)
gitResponse.raise_for_status()
gitData = json.loads(gitResponse.content.decode("utf-8"))
-
+
for committee in gitData['projects']:
for repo in gitData['projects'][committee]['repositories']:
repos[repo] = 'https://gitbox.apache.org/repos/asf/' + repo +
'.git'
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/jsonutils.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/jsonutils.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/scripts/cronjobs/jsonutils.py (original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/jsonutils.py Wed Jun 18
09:54:45 2025
@@ -18,7 +18,7 @@ def write_utf8(output, path, indent=1, s
"""
with open(path, "w", encoding='utf-8') as f:
json.dump(output, f, indent=indent, sort_keys=sort_keys,
ensure_ascii=ensure_ascii)
-
+
def read_utf8(path):
"""
Read and parse JSON from the given file path assuming UTF-8 encoding
Modified:
comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py
(original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py Wed
Jun 18 09:54:45 2025
@@ -174,7 +174,7 @@ for group in sorted(committees, key=keyo
img = "http://www.apache.org/logos/res/%s/default.png" %
committeeId
if not skipImageTest and not URLexists(img):
print("WARN: could not find logo: %s" % (img))
-
+
committeeCount += 1
committee={}
committee['id'] = committeeId
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py
(original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/parsereleases.py Wed Jun
18 09:54:45 2025
@@ -96,7 +96,7 @@ def parseFile(committeeId, file, date, p
if not ext in VALID_TYPES or (ext in TAR_TYPES and parts.pop() != 'tar'):
return
stem = ".".join(parts) # the filename stem without the archive suffice(s)
- if (any(stem.endswith(end) for end in NON_SOURCE_ENDS +
CTTEE_FILTERS.get(committeeId,{}).get('ENDS',[])) or
+ if (any(stem.endswith(end) for end in NON_SOURCE_ENDS +
CTTEE_FILTERS.get(committeeId,{}).get('ENDS',[])) or
any(mat in stem for mat in NON_SOURCE_MATCH +
CTTEE_FILTERS.get(committeeId,{}).get('MATCH',[]))):
return
filename = cleanFilename(stem)
@@ -111,7 +111,7 @@ def main():
uc = UrlCache(silent=True)
find_ls = uc.get(FIND_LS, name='find-ls2.txt.gz')
# -rw-rw-r-- 1 svnwc svnwc 479 2022-06-17 12:55 UTC
./.htaccess
- # 0 1 2 3 4 5 6 7 8
+ # 0 1 2 3 4 5 6 7 8
with gzip.open(find_ls, mode='rt') as r:
for l in r:
fields = l.split() # split the find line (the split drops the
final LF)
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/podlings.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/podlings.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/scripts/cronjobs/podlings.py (original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/podlings.py Wed Jun 18
09:54:45 2025
@@ -17,7 +17,7 @@ Creates:
data = URLopen("http://incubator.apache.org/podlings.xml").read()
xmldoc = minidom.parseString(data)
-itemlist = xmldoc.getElementsByTagName('podling')
+itemlist = xmldoc.getElementsByTagName('podling')
new = {}
grads = {}
@@ -118,7 +118,7 @@ for i in js:
current -= i['new']
current += i['graduated']
current += i['retired']
-
+
print("Writing podlings.json")
with open('../../site/json/foundation/podlings.json', 'w', encoding='utf-8')
as f:
json.dump(cpods, f, sort_keys=True, indent=0, ensure_ascii=False)
Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/urlutils.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/urlutils.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/scripts/cronjobs/urlutils.py (original)
+++ comdev/projects.apache.org/trunk/scripts/cronjobs/urlutils.py Wed Jun 18
09:54:45 2025
@@ -54,7 +54,7 @@ def mod_date(t):
def getIfNewer(url, sinceTime=None, encoding=None, errors=None, silent=False,
debug=False, method='GET'):
"""
Get a URL if it is newer
-
+
@param url: the url to fetch (required)
@param sinceTime: the most recent Last-Modified string (format as per
mod_date())
@param encoding: the encoding to use (default 'None')
@@ -130,10 +130,10 @@ class UrlCache(object):
If a check interval is specified (>0),
a hidden marker file is used to record the last check time (unless
useFileModTime==True)
- @param cachedir: the cache directory to use
+ @param cachedir: the cache directory to use
(default data/cache; this is assumed to be at the current
directory, its parent or grandparent)
@param interval: minimum interval between checks for updates to the
URL (default 300 secs)
- if set to -1, never checks (intended for testing only)
+ if set to -1, never checks (intended for testing only)
if set to 0, always checks (primarily intended for testing, also
useful where URLs support If-Modified-Since)
@return: the instance to use with the get() method
"""
@@ -158,7 +158,7 @@ class UrlCache(object):
else:
self.__cachedir = __CACHE # will be overwritten if actually found
self.__cachedir = findRelPath(__CACHE)
-
+
if os.path.isdir(self.__cachedir):
if not self.__silent: print("Cachedir: %s" % self.__cachedir)
else:
@@ -193,7 +193,7 @@ class UrlCache(object):
to reduce the time when the file is being updated.
The interval parameter is used to determine how often to check if
the URL has changed.
(this is mainly intended to avoid excess URL requests in unit
testing).
- If this is set to -1, then the URL will only be downloaded once.
+ If this is set to -1, then the URL will only be downloaded once.
@param url: the url to fetch (required)
@param name: the name to use in the cache (required)
@param encoding: the encoding to use (default None)
@@ -202,7 +202,7 @@ class UrlCache(object):
@param useFileModTime: whether to use the file modification time
as the last check time
If not, a hidden marker file is used (default false). Set this to
true for URLs that don't
provide a Last-Modified header
- @return: the opened stream, using the encoding if specified.
Otherwise opened in binary mode.
+ @return: the opened stream, using the encoding if specified.
Otherwise opened in binary mode.
"""
if name == None:
name = basename(urlparse(url).path)
@@ -249,7 +249,7 @@ class UrlCache(object):
lastModT = 0
else:
lastModT = 0
-
+
tmpFile = target + ".tmp"
with open(tmpFile,'wb') as f:
shutil.copyfileobj(response, f)
@@ -267,7 +267,7 @@ class UrlCache(object):
else:
if not self.__silent: print("Cached copy of %s is up to date
(%s)" % (name, lastMod))
-
+
if self.__interval > 0: # no point creating a marker file if we
won't be using it
if useFileModTime:
os.utime(check, None) # touch the marker file
Modified: comdev/projects.apache.org/trunk/site/edit/index.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/site/edit/index.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/site/edit/index.py (original)
+++ comdev/projects.apache.org/trunk/site/edit/index.py Wed Jun 18 09:54:45 2025
@@ -12,7 +12,7 @@ if m:
data = f.read()
f.close()
print(data.replace("%name%", uid))
-
+
else:
print("Unknown or invalid user id presented")
-
+
Modified: comdev/projects.apache.org/trunk/site/make_doap.py
URL:
http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/site/make_doap.py?rev=1926538&r1=1926537&r2=1926538&view=diff
==============================================================================
--- comdev/projects.apache.org/trunk/site/make_doap.py (original)
+++ comdev/projects.apache.org/trunk/site/make_doap.py Wed Jun 18 09:54:45 2025
@@ -53,7 +53,7 @@ dt = '{:%Y-%m-%d}'.format(datetime.datet
form = cgi.FieldStorage()
projName = form.getvalue("name", "projectName")
-# projName is used in the response headers; ensure the name is safe as a file
name
+# projName is used in the response headers; ensure the name is safe as a file
name
projName = re.sub(r"[^\w-]", '_', projName) + ".rdf"
thehomepage = makeURL(form.getvalue('homepage','www.apache.org'))
@@ -64,8 +64,8 @@ Content-Disposition: attachment; filenam
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:asfext="http://projects.apache.org/ns/asfext#"
xmlns:foaf="http://xmlns.com/foaf/0.1/">
<!--
@@ -75,9 +75,9 @@ Content-Disposition: attachment; filenam
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
https://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -86,7 +86,7 @@ Content-Disposition: attachment; filenam
-->
<Project rdf:about="%(thehomepage)s">
<created>%(dt)s</created>
- <license rdf:resource="https://spdx.org/licenses/Apache-2.0" />"""
+ <license rdf:resource="https://spdx.org/licenses/Apache-2.0" />"""
% {'projName' : projName, 'dt': dt, 'thehomepage': thehomepage} )
for line in formData:
@@ -141,7 +141,7 @@ if form.getvalue('std_title'):
<asfext:body>%s</asfext:body>
<asfext:id>%s</asfext:id>
<asfext:url rdf:resource="%s"/>
- </asfext:Standard></asfext:implements>"""
+ </asfext:Standard></asfext:implements>"""
% (form.getvalue('std_title'), form.getvalue('std_body'),
form.getvalue('std_id'), makeURL(form.getvalue('std_url'))))
print(""" </Project>