mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
320,128 Commits 1 Branch 0 Tags
6b86b55107751b1f0d03fad2a59bf8049cda3bdc
Commit Graph

36 Commits

Author SHA1 Message Date
Caolán McNamara
c25bee9ca3 make emailmerge work with python3 and python2 at the same time 
Change-Id: I6289b522513a2fc86e261c85a04ca9c89fd55b63
 2013-01-15 17:17:45 +00:00
Caolán McNamara
932e916a9c tidy mailmerge debuging messages 
Change-Id: Ibca2af0efa448ed4c2c5b7ad73febf16cbf03480
 2013-01-15 16:32:22 +00:00
Caolán McNamara
e48a060eb8 make emailmerge work for me with python3 
Change-Id: I4f79aa69b39d2be8fcceacc90b858f116f875385
 2013-01-15 14:58:06 +00:00
Ariel Constenla-Haile
8a324a3ba5 i118814 - Allow set connection timeout in Mail API 
Conflicts:
	scripting/source/pyprov/mailmerge.py

Change-Id: I7a3eb3b29f41eed154abd45e1aa5be824983f5de
 2013-01-15 14:58:05 +00:00
Ariel Constenla-Haile
a5cefd4007 i118791 - Encode ReadableName in UTF-8 only when necessary 
Conflicts:
	scripting/source/pyprov/mailmerge.py

Change-Id: I5275bdbbc21f422248a32b824ea6de965c23abd0
 2013-01-15 14:58:05 +00:00
Ariel Constenla-Haile
3f2f92b753 i118736 - i118787 : fix XMailMessage implementation in mailmerge.py 
(cherry picked from commit 4166969f3b8ed05e91c10a724ce7bd39074012a1)

Conflicts:
	scripting/source/pyprov/mailmerge.py

Change-Id: I794735f02db1efe04b323fed9db5458242e5c16a
 2013-01-15 14:58:04 +00:00
Michael Stahl
907b63a0f3 mailmerge.py: fix the debug strings again 
Change-Id: Iceac0952b6fc9765cb12f6694260070c1c17296b
 2013-01-14 20:06:08 +01:00
Michael Stahl
1a5b3d8e4d fdo#59249: mailmerge.py: adapt to changes in smtplib: 
Apparently the login() method in Python 3.3 expects str arguments for
user and password, since it calls encode on them, but for Python 2.6 the
"encode" calls were explicitly added in the caller since login() does
not encode itself; add an ugly version check for that.

Change-Id: Iebfce44073a837e9cb845855ba448d5b6a2ebd11
 2013-01-14 12:40:40 +01:00
Michael Stahl
b08dc0b777 Revert "fdo#59249: mailmerge.py: some more bytes vs. str mangling" 
This reverts commit 9dec0c7901.

Was nonsense because login method actually expects "str" arguments.
 2013-01-14 12:40:40 +01:00
Michael Stahl
9dec0c7901 fdo#59249: mailmerge.py: some more bytes vs. str mangling 
Obvious problems are in debug code only.

Change-Id: I45aafb4f194a5a020bb95bd96c2d92ca7ee578f8
 2013-01-11 19:08:24 +01:00
Stephan Bergmann
ac56d9373a Can't convert 'Enum' resp. 'bytes' object to str implicitly 
...when you set dbg = True

Change-Id: Ifc170e9336a662dce2ae59227baf3bea692eedac
 2013-01-11 18:32:04 +01:00
Stephan Bergmann
7a7e19c166 fdo#59249: String literal needs a "b" prefix in Pyhton 3 
as the corresponding test is otherwise seen to fail, with user being b, but I have
no idea if this is the most Python-3-ish approach to fix that, or whether more code
needs to be fixed, too.

Change-Id: Ia7fbcbca3cf578ffe1bd5ce3c7c5b709cc77317e
 2013-01-11 18:29:27 +01:00
Julien Nabet
8269d576ec Fix type SMPT->SMTP 
Change-Id: I09dfd8c2385e6257248b6a43ee4e2ce97ee6bdfc
 2013-01-07 22:15:47 +01:00
Michael Stahl
37c6cfde4d officehelper.py: fix obvious Python 3 issues 
Change-Id: I40691cd6b1a0a6777e6469bf242fb41dac423587
 2012-12-12 12:51:47 +01:00
Michael Stahl
2462391f4c mailmerge.py: fix obvious Python 3 issues 
Change-Id: I796696fbfe1756d625dcabc56c8769bed3d5dbc1
 2012-12-11 23:08:53 +01:00
Caolán McNamara
6843ce885e Resolves: fdo#38713 fix multiple recipients in mailmerge 
It appears I don't know the correct syntax for concatenating tuples

Change-Id: I32756caeaabfcc52e521108da917aeadf8256caa
 2012-06-29 12:20:16 +01:00
Caolán McNamara
a434088adf Resolves: fdo#40516 missing : on line 52 2011-08-31 16:35:23 +01:00
Caolán McNamara
a1775d69e8 make logging less painful under windows 2011-08-02 11:07:16 +01:00
Caolán McNamara
a34c9a8065 can't use set_debuglevel under windows 2011-08-02 11:07:16 +01:00
Caolán McNamara
de0b43dcdb coerce port to int 2011-07-26 12:24:49 +01:00
Julien Nabet
5bc917e58e fix tabs + attributes not declared 2011-03-12 23:19:46 +01:00
Julien Nabet
e159b98bca replace spaces (put by mistake) with tabs 2011-03-12 16:37:27 +01:00
Caolán McNamara
ad8b848d21 fix up the default fallback string for this now 2010-12-22 10:45:48 +00:00
Caolán McNamara
aa183d45c8 emailmerge33fix: #i113134# 2010-07-14 14:17:11 +01:00
Caolán McNamara
1711ca5365 cmcfixes75: #i111508# implement a com.sun.star.mail.Mailserver in mailmerge.py 2010-05-10 11:20:35 +01:00
Caolán McNamara
07e314f63e cmcfixes71: #i108945# fix From field in mailmerge 2010-02-04 11:13:49 +00:00
Caolán McNamara
1351162b3c pythonssldedux: #i105669# password/username must be ascii for CRAM-MD5 2009-11-09 08:38:31 +00:00
Rüdiger Timm
7545436c5b CWS-TOOLING: integrate CWS cmcfixes51 
2008-12-08 10:12:55 +0100 cmc  r264975 : #i96203# protect with ifdefs to avoid unused symbol on mac
2008-12-05 12:23:47 +0100 cmc  r264898 : CWS-TOOLING: rebase CWS cmcfixes51 to trunk@264807 (milestone: DEV300:m37)
2008-12-01 14:45:17 +0100 cmc  r264606 : #i76655# ehlos apparently required
2008-11-28 17:49:30 +0100 cmc  r264567 : #i96655# remove newly unused method
2008-11-28 10:41:28 +0100 cmc  r264531 : #i96647# better ppc-bridges flushCode impl
2008-11-27 12:58:40 +0100 cmc  r264478 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 12:32:49 +0100 cmc  r264476 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 12:26:02 +0100 cmc  r264475 : #i96655# redundant old table export helpers
2008-11-27 11:49:06 +0100 cmc  r264473 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:38:35 +0100 cmc  r264471 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:14:21 +0100 cmc  r264467 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:06:22 +0100 cmc  r264464 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:58:18 +0100 cmc  r264462 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:41:44 +0100 cmc  r264461 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:19:24 +0100 cmc  r264460 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:13:39 +0100 cmc  r264459 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:06:14 +0100 cmc  r264458 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:59:54 +0100 cmc  r264457 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:52:51 +0100 cmc  r264456 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:48:26 +0100 cmc  r264454 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:40:20 +0100 cmc  r264452 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:35:26 +0100 cmc  r264451 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:31:00 +0100 cmc  r264450 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:24:08 +0100 cmc  r264449 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:26:15 +0100 cmc  r264443 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:21:01 +0100 cmc  r264442 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:09:40 +0100 cmc  r264441 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 23:51:56 +0100 cmc  r264440 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 23:49:09 +0100 cmc  r264439 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 18:09:54 +0100 cmc  r264432 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 18:07:40 +0100 cmc  r264431 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:28:02 +0100 cmc  r264429 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:27:39 +0100 cmc  r264428 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:18:36 +0100 cmc  r264426 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 16:22:16 +0100 cmc  r264415 : #i96624# make implicit braces and brackets explicit to avoid warnings
2008-11-26 16:00:23 +0100 cmc  r264409 : #i90426# remove warnings from svtools
2008-11-26 15:59:17 +0100 cmc  r264408 : #i90426# remove warnings
2008-11-26 15:47:32 +0100 cmc  r264404 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:46:57 +0100 cmc  r264394 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:19:50 +0100 cmc  r264387 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:15:26 +0100 cmc  r264386 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:11:26 +0100 cmc  r264384 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 13:44:23 +0100 cmc  r264380 : #i96084# comfirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 13:12:24 +0100 cmc  r264372 : #i96604# silence new warnings
2008-11-26 12:35:02 +0100 cmc  r264369 : #i96203# make qstarter work in 3-layer land
2008-11-26 12:33:04 +0100 cmc  r264368 : #i96170# ensure gtypes are up and running
 2008-12-11 07:05:03 +00:00
Vladimir Glazounov
7fbaa75d5a INTEGRATION: CWS cmcfixes48 (1.8.38); FILE MERGED 
2008/08/11 15:48:36 cmc 1.8.38.1: bad bang
 2008-08-18 12:17:38 +00:00
Vladimir Glazounov
28499d947c INTEGRATION: CWS os108 (1.7.26); FILE MERGED 
2007/11/29 06:43:28 os 1.7.26.2: #i77449# missing import added
2007/11/15 12:07:23 os 1.7.26.1: #i77449# SenderName added to mail merge e-Mail
 2007-12-06 09:57:39 +00:00
Rüdiger Timm
00712aa434 INTEGRATION: CWS cmcfixes33 (1.6.8); FILE MERGED 
2007/03/13 11:45:20 cmc 1.6.8.1: #i74789# better mimetype and add a proper timestamp
 2007-04-26 07:06:44 +00:00
Oliver Bolte
61bd16b91b INTEGRATION: CWS cmcfixes31 (1.2.48); FILE MERGED 
2007/01/10 12:31:53 cmc 1.2.48.1: #i69250# use truerecipients not recipients as sendmail recipients
 2007-01-25 15:18:23 +00:00
Yuan Li
2fde311a23 resume 2007-01-25 02:30:57 +00:00
Yuan Li
54680a30aa class MIMEBase is in the email.mime namespace in the python-2.5 2007-01-25 02:21:28 +00:00
Yuan Li
efdbc4d3a6 #71327, by liyuan 2007-01-24 12:40:44 +00:00
Rüdiger Timm
e36f81e520 INTEGRATION: CWS oooemailmerge (1.1.2); FILE ADDED 
2005/09/09 12:59:26 cmc 1.1.2.1: #i51638# add python emailmerge backend
 2005-11-11 09:38:51 +00:00