Skip to content

Commit e7e62f2

Browse files
author
Richard Jones
committed
Beginnings of a big code cleanup / modernisation to make 2to3 happy
1 parent 0299f3f commit e7e62f2

16 files changed

+529
-395
lines changed

‎2to3-done.txt‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
CAN'T VERIFY
2+
3+
./roundup/backends/back_mysql.py
4+
./roundup/backends/back_tsearch2.py
5+
./roundup/backends/indexer_xapian.py
6+
7+
TODO
8+
9+
./roundup/backends/rdbms_common.py
10+
./roundup/backends/sessions_dbm.py
11+
./roundup/backends/sessions_rdbms.py
12+
./roundup/backends/tsearch2_setup.py
13+
./roundup/cgi/__init__.py
14+
./roundup/cgi/accept_language.py
15+
./roundup/cgi/actions.py
16+
./roundup/cgi/apache.py
17+
./roundup/cgi/cgitb.py
18+
./roundup/cgi/client.py
19+
./roundup/cgi/exceptions.py
20+
./roundup/cgi/form_parser.py
21+
./roundup/cgi/MultiMapping.py
22+
./roundup/cgi/PageTemplates/__init__.py
23+
./roundup/cgi/PageTemplates/Expressions.py
24+
./roundup/cgi/PageTemplates/GlobalTranslationService.py
25+
./roundup/cgi/PageTemplates/MultiMapping.py
26+
./roundup/cgi/PageTemplates/PageTemplate.py
27+
./roundup/cgi/PageTemplates/PathIterator.py
28+
./roundup/cgi/PageTemplates/PythonExpr.py
29+
./roundup/cgi/PageTemplates/TALES.py
30+
./roundup/cgi/TAL/__init__.py
31+
./roundup/cgi/TAL/DummyEngine.py
32+
./roundup/cgi/TAL/HTMLParser.py
33+
./roundup/cgi/TAL/HTMLTALParser.py
34+
./roundup/cgi/TAL/markupbase.py
35+
./roundup/cgi/TAL/TALDefs.py
36+
./roundup/cgi/TAL/TALGenerator.py
37+
./roundup/cgi/TAL/talgettext.py
38+
./roundup/cgi/TAL/TALInterpreter.py
39+
./roundup/cgi/TAL/TALParser.py
40+
./roundup/cgi/TAL/TranslationContext.py
41+
./roundup/cgi/TAL/XMLParser.py
42+
./roundup/cgi/templating.py
43+
./roundup/cgi/TranslationService.py
44+
./roundup/cgi/wsgi_handler.py
45+
./roundup/cgi/zLOG.py
46+
./roundup/cgi/ZTUtils/__init__.py
47+
./roundup/cgi/ZTUtils/Batch.py
48+
./roundup/cgi/ZTUtils/Iterator.py
49+
./roundup/configuration.py
50+
./roundup/date.py
51+
./roundup/dist/__init__.py
52+
./roundup/dist/command/__init__.py
53+
./roundup/dist/command/bdist_rpm.py
54+
./roundup/dist/command/build.py
55+
./roundup/dist/command/build_doc.py
56+
./roundup/dist/command/build_py.py
57+
./roundup/dist/command/build_scripts.py
58+
./roundup/exceptions.py
59+
./roundup/hyperdb.py
60+
./roundup/i18n.py
61+
./roundup/init.py
62+
./roundup/install_util.py
63+
./roundup/instance.py
64+
./roundup/mailer.py
65+
./roundup/mailgw.py
66+
./roundup/msgfmt.py
67+
./roundup/password.py
68+
./roundup/rfc2822.py
69+
./roundup/roundupdb.py
70+
./roundup/scripts/__init__.py
71+
./roundup/scripts/roundup_admin.py
72+
./roundup/scripts/roundup_demo.py
73+
./roundup/scripts/roundup_gettext.py
74+
./roundup/scripts/roundup_mailgw.py
75+
./roundup/scripts/roundup_server.py
76+
./roundup/scripts/roundup_xmlrpc_server.py
77+
./roundup/security.py
78+
./roundup/support.py
79+
./roundup/token.py
80+
./roundup/version_check.py
81+
./roundup/xmlrpc.py
82+
./run_tests.py
83+
./scripts/copy-user.py
84+
./scripts/imapServer.py
85+
./scripts/import_sf.py
86+
./scripts/schema_diagram.py
87+
./setup.py
88+
./share/roundup/templates/classic/detectors/messagesummary.py
89+
./share/roundup/templates/classic/detectors/nosyreaction.py
90+
./share/roundup/templates/classic/detectors/statusauditor.py
91+
./share/roundup/templates/classic/detectors/userauditor.py
92+
./share/roundup/templates/classic/initial_data.py
93+
./share/roundup/templates/classic/schema.py
94+
./share/roundup/templates/minimal/detectors/userauditor.py
95+
./share/roundup/templates/minimal/initial_data.py
96+
./share/roundup/templates/minimal/schema.py
97+
./test/__init__.py
98+
./test/benchmark.py
99+
./test/db_test_base.py
100+
./test/memorydb.py
101+
./test/mocknull.py
102+
./test/session_common.py
103+
./test/test_actions.py
104+
./test/test_anydbm.py
105+
./test/test_anypy_hashlib.py
106+
./test/test_cgi.py
107+
./test/test_dates.py
108+
./test/test_hyperdbvals.py
109+
./test/test_indexer.py
110+
./test/test_locking.py
111+
./test/test_mailer.py
112+
./test/test_mailgw.py
113+
./test/test_mailsplit.py
114+
./test/test_memorydb.py
115+
./test/test_multipart.py
116+
./test/test_mysql.py
117+
./test/test_postgresql.py
118+
./test/test_rfc2822.py
119+
./test/test_schema.py
120+
./test/test_security.py
121+
./test/test_sqlite.py
122+
./test/test_templating.py
123+
./test/test_textfmt.py
124+
./test/test_token.py
125+
./test/test_tsearch2.py
126+
./test/test_userauditor.py
127+
./test/test_xmlrpc.py
128+
./test.py
129+
./tools/fixroles.py
130+
./tools/load_tracker.py
131+
./tools/migrate-queries.py
132+
./tools/pygettext.py
133+
./frontends/ZRoundup/__init__.py
134+
./frontends/ZRoundup/ZRoundup.py
135+
136+
137+
138+
DONE
139+
140+
./doc/conf.py
141+
./roundup/__init__.py
142+
./roundup/admin.py
143+
./roundup/actions.py
144+
./roundup/anypy/__init__.py
145+
./roundup/anypy/hashlib_.py
146+
./roundup/anypy/sets_.py
147+
./roundup/backends/__init__.py
148+
./roundup/backends/back_anydbm.py
149+
./roundup/backends/back_postgresql.py
150+
./roundup/backends/back_sqlite.py
151+
./roundup/backends/blobfiles.py
152+
./roundup/backends/indexer_common.py
153+
./roundup/backends/indexer_dbm.py
154+
./roundup/backends/indexer_rdbms.py
155+
./roundup/backends/locking.py
156+
./roundup/backends/portalocker.py

‎CHANGES.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
This file contains the changes to the Roundup system over time. The entries
22
are given with the most recent entry first.
33

4-
2010-02-?? 1.4.13
4+
2010-02-19 1.4.13
55

66
Fixed:
77
- Multilink edit fields lose their values (thanks Will Maier)

‎doc/announcement.txt‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,11 @@
1-
I'm proud to release version 1.4.12 of Roundup which fixes a number bugs.
1+
I'm proud to release version 1.4.13 of Roundup which includes a single
2+
fix for a regression introduced in 1.4.12:
3+
4+
- Multilink edit fields lose their values (thanks Will Maier)
25

36
If you're upgrading from an older version of Roundup you *must* follow
47
the "Software Upgrade" guidelines given in the maintenance documentation.
58

6-
This release includes:
7-
8-
- Support IMAP CRAM-MD5, thanks Jochen Maes
9-
- Proper handling of 'Create' permissions in both mail gateway (earlier
10-
commit r4405 by Richard), web interface, and xmlrpc. This used to
11-
check 'Edit' permission previously. See
12-
http://thread.gmane.org/gmane.comp.bug-tracking.roundup.devel/5133
13-
Add regression tests for proper handling of 'Create' and 'Edit'
14-
permissions.
15-
- Fix handling of non-ascii in realname in the nosy mailer, this used to
16-
mangle the email address making it unusable when replying. Thanks to
17-
intevation for funding the fix.
18-
- Fix documentation on user required to run the tests, fixes
19-
issue2550618, thanks to Chris aka 'radioking'
20-
- Add simple doc about translating customised tracker content
21-
- Add "flup" setup documentation, thanks Christian Glass
22-
- Fix "Web Access" permission check to allow serving of static files to
23-
Anonymous again
24-
- Add check for "Web Access" permission in all web templating permission
25-
checks
26-
- Improvements in upgrading documentation, thanks Christian Glass
27-
- Display 'today' in the account user's timezone, thanks David Wolever
28-
- Fix file handle leak in some web interfaces with logging turned on,
29-
fixes issue1675845
30-
- Attempt to generate more human-readable addresses in email, fixes
31-
issue2550632
32-
- Allow value to be specified to multilink form element templating, fixes
33-
issue2550613, thanks David Wolever
34-
- Fix thread safety with stdin in roundup-server, fixes issue2550596
35-
(thanks Werner Hunger)
36-
379
Roundup requires python 2.3 or later (but not 3+) for correct operation.
3810

3911
To give Roundup a try, just download (see below), unpack and run::

‎doc/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@
169169
# Grouping the document tree into LaTeX files. List of tuples
170170
# (source start file, target name, title, author, document class [howto/manual]).
171171
latex_documents = [
172-
('docs/index', 'Roundup.tex', ur'Roundup Documentation',
173-
ur'Richard Jones', 'manual'),
172+
('docs/index', 'Roundup.tex', u'Roundup Documentation',
173+
u'Richard Jones', 'manual'),
174174
]
175175

176176
# The name of an image file (relative to this directory) to place at the top of

‎roundup/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@
6868
'''
6969
__docformat__ = 'restructuredtext'
7070

71-
__version__ = '1.4.12'
71+
__version__ = '1.5.0'
7272

7373
# vim: set filetype=python ts=4 sw=4 et si

‎roundup/actions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ def handle(self, designator):
4949
# make sure we don't try to retire admin or anonymous
5050
if (classname == 'user' and
5151
self.db.user.get(itemid, 'username') in ('admin', 'anonymous')):
52-
raise ValueError, self._(
53-
'You may not retire the admin or anonymous user')
52+
raise ValueError(self._(
53+
'You may not retire the admin or anonymous user'))
5454

5555
# do the retire
5656
self.db.getclass(classname).retire(itemid)

0 commit comments

Comments
 (0)