Skip to content

Commit 3cd0b46

Browse files
author
Richard Jones
committed
email file attachments added to issue files list [SF#711501]
1 parent eccde2d commit 3cd0b46

File tree

4 files changed

+80
-20
lines changed

4 files changed

+80
-20
lines changed

BUILD.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ So, those commands in a nice, cut'n'pasteable form::
2525
python setup.py clean --all
2626
python setup.py sdist --manifest-only
2727
python setup.py sdist --quiet
28+
python2.3 setup.py register
2829

2930
or, for the sad RedHat users::
3031

3132
python2 setup.py clean --all
3233
python2 setup.py sdist --manifest-only
3334
python2 setup.py sdist --quiet
35+
python2.3 setup.py register
3436

3537

3638
Distributing Releases

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ are given with the most recent entry first.
99
- only look for CSV files when importing (thanks Dan Grassi)
1010
- can now unset values in CSV editing (sf bug 704788)
1111
- fixed rdbms email address lookup (case insensitivity)
12+
- email file attachments added to issue files list (sf bug 711501)
1213

1314

1415
2003-02-27 0.5.6

COPYING.txt

Lines changed: 65 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
Roundup Licensing
22
-----------------
33

4+
Copyright (c) 2003 Richard Jones ([email protected])
45
Copyright (c) 2002 eKit.com Inc (http://www.ekit.com/)
6+
Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
57

68
Permission is hereby granted, free of charge, to any person obtaining a copy
79
of this software and associated documentation files (the "Software"), to deal
@@ -22,24 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2224
SOFTWARE.
2325

2426

25-
Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
26-
27-
This module is free software, and you may redistribute it and/or modify
28-
under the same terms as Python 2.1 (the PSF LICENSE AGREEMENT), so long
29-
as this copyright message and disclaimer are retained in their original form.
30-
31-
IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR
32-
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING
33-
OUT OF THE USE OF THIS CODE, EVEN IF BIZAR SOFTWARE PTY LTD HAS BEEN
34-
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35-
36-
BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
37-
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
38-
FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
39-
BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
40-
SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
41-
42-
4327
PageTemplates Licensing
4428
-----------------------
4529

@@ -56,5 +40,67 @@ the following manner:
5640
HISTORY.txt.
5741
- editing to remove dependencies on Zope modules (see files for change notes)
5842

59-
The license for this code is in doc/ZPL.txt.
43+
The license for this code is the `Zope Public License (ZPL) Version 2.0`_,
44+
included below.
45+
46+
47+
Zope Public License (ZPL) Version 2.0
48+
-------------------------------------
49+
50+
This software is Copyright (c) Zope Corporation (tm) and
51+
Contributors. All rights reserved.
52+
53+
This license has been certified as open source. It has also
54+
been designated as GPL compatible by the Free Software
55+
Foundation (FSF).
56+
57+
Redistribution and use in source and binary forms, with or
58+
without modification, are permitted provided that the
59+
following conditions are met:
60+
61+
1. Redistributions in source code must retain the above
62+
copyright notice, this list of conditions, and the following
63+
disclaimer.
64+
65+
2. Redistributions in binary form must reproduce the above
66+
copyright notice, this list of conditions, and the following
67+
disclaimer in the documentation and/or other materials
68+
provided with the distribution.
69+
70+
3. The name Zope Corporation (tm) must not be used to
71+
endorse or promote products derived from this software
72+
without prior written permission from Zope Corporation.
73+
74+
4. The right to distribute this software or to use it for
75+
any purpose does not give you the right to use Servicemarks
76+
(sm) or Trademarks (tm) of Zope Corporation. Use of them is
77+
covered in a separate agreement (see
78+
http://www.zope.com/Marks).
79+
80+
5. If any files are modified, you must cause the modified
81+
files to carry prominent notices stating that you changed
82+
the files and the date of any change.
83+
84+
Disclaimer
85+
86+
THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS''
87+
AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
88+
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
89+
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
90+
NO EVENT SHALL ZOPE CORPORATION OR ITS CONTRIBUTORS BE
91+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
92+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
93+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
94+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
95+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
96+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
97+
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
98+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
99+
DAMAGE.
100+
101+
102+
This software consists of contributions made by Zope
103+
Corporation and many individuals on behalf of Zope
104+
Corporation. Specific attributions are listed in the
105+
accompanying credits file.
60106

roundup/mailgw.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class node. Any parts of other types are each stored in separate files
7373
an exception, the original message is bounced back to the sender with the
7474
explanatory message given in the exception.
7575
76-
$Id: mailgw.py,v 1.104.2.1 2003-02-06 05:44:49 richard Exp $
76+
$Id: mailgw.py,v 1.104.2.2 2003-04-23 12:10:51 richard Exp $
7777
'''
7878

7979
import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
@@ -836,6 +836,17 @@ def handle_message(self, message):
836836
files.append(self.db.file.create(type=mime_type, name=name,
837837
content=data))
838838

839+
# attach the files to the issue
840+
if nodeid:
841+
# extend the existing files list
842+
fileprop = cl.get(nodeid, 'file')
843+
fileprop.extend(files)
844+
props['files'] = fileprop
845+
else:
846+
# pre-load the files list
847+
props['files'] = fileprop
848+
849+
839850
#
840851
# create the message if there's a message body (content)
841852
#

0 commit comments

Comments
 (0)