tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	Changelog.draft.rst
This commit is contained in:
Nicolas Sebrecht
2011-01-28 19:48:35 +01:00
parent 2e1983d5ef 9afb432053
commit 84b7c686ec
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.draft.rst
View File

@@ -22,6 +22,7 @@ Bug Fixes
--------- ---------
* Makefile: docutils: work whether python extension is stripped or not * Makefile: docutils: work whether python extension is stripped or not
* accord __version__ with import
Pending for the next major release Pending for the next major release

2
offlineimap/folder/IMAP.py
View File

@@ -234,7 +234,7 @@ class IMAPFolder(BaseFolder):
headervalue += binascii.hexlify(self.getname()) headervalue += binascii.hexlify(self.getname())
headervalue += '-%d-' % long(time.time()) headervalue += '-%d-' % long(time.time())
headervalue += str(self.randomgenerator.random()).replace('.', '') headervalue += str(self.randomgenerator.random()).replace('.', '')
headervalue += '-v' + offlineimap.__version__ headervalue += '-v' + __version__
return (headername, headervalue) return (headername, headervalue)
def savemessage_addheader(self, content, headername, headervalue): def savemessage_addheader(self, content, headername, headervalue):