[Python-modules-commits] r16772 - in packages/pubtal/trunk/debian (3 files)

[rodrigo at users.alioth.debian.org]

    Date: Tuesday, April 26, 2011 @ 04:03:32
  Author: rodrigo
Revision: 16772

New upstream 3.5.

Incorporates our textile_plugin_update patch. Yay for quick upstreams!

Modified:
  packages/pubtal/trunk/debian/changelog
Deleted:
  packages/pubtal/trunk/debian/patches/series
  packages/pubtal/trunk/debian/patches/textile_plugin_update

Modified: packages/pubtal/trunk/debian/changelog
===================================================================
--- packages/pubtal/trunk/debian/changelog	2011-04-25 15:24:15 UTC (rev 16771)
+++ packages/pubtal/trunk/debian/changelog	2011-04-26 04:03:32 UTC (rev 16772)
@@ -1,3 +1,10 @@
+pubtal (3.5-1~1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Stops encoding text sent to Textile (Closes: #619531).
+
+ -- Luis Rodrigo Gallardo Cruz <rodrigo at debian.org>  Mon, 25 Apr 2011 20:45:11 -0700
+
 pubtal (3.4-1~1) UNRELEASED; urgency=low
 
   * New upstream release

Deleted: packages/pubtal/trunk/debian/patches/series
===================================================================
--- packages/pubtal/trunk/debian/patches/series	2011-04-25 15:24:15 UTC (rev 16771)
+++ packages/pubtal/trunk/debian/patches/series	2011-04-26 04:03:32 UTC (rev 16772)
@@ -1 +0,0 @@
-textile_plugin_update

Deleted: packages/pubtal/trunk/debian/patches/textile_plugin_update
===================================================================
--- packages/pubtal/trunk/debian/patches/textile_plugin_update	2011-04-25 15:24:15 UTC (rev 16771)
+++ packages/pubtal/trunk/debian/patches/textile_plugin_update	2011-04-26 04:03:32 UTC (rev 16772)
@@ -1,50 +0,0 @@
-Subject: Update the textile plugin to newer versions of textile
-Author: Rodrigo Gallardo <rodrigo at debian.org>
-Bug-Debian: http://bugs.debian.org/619531
-Forwarded: By private email to upstream author
-
-Since version 2.1.4 python-textile stopped doing character set
-conversion in the input or output texts. This means that the textile
-plugin can also stop doing conversions, and can instead simply hand
-off unicode to textile and get unicode back.
-
-Index: pubtal-3.3/optional-plugins/textileContent.py
-===================================================================
---- pubtal-3.3.orig/optional-plugins/textileContent.py
-+++ pubtal-3.3/optional-plugins/textileContent.py
-@@ -74,29 +74,13 @@
- 		
- 	def getPageContext (self, page, template):
- 		pageMap = SitePublisher.ContentPublisher.getPageContext (self, page, template)
--		
--		# We need to preserve the original character set because Textile does it's own conversion.
--		headers, rawContent = self.readHeadersAndContent(page, preserveCharacterSet = 1)
--		pageCharSet = page.getOption ('character-set', None)
--		if (pageCharSet is None):
--			pageCharSet = self.characterSet
--		pageCharSetDecoder = codecs.lookup (pageCharSet)[1]
--				
--		# Pass in the encoding of the file, and get output in utf-16
--		content = textile.textile (rawContent, encoding=pageCharSet, output="utf16")
--		# Now convert the body from utf16 back to Unicode
--		content = utf16Decoder (content)[0]
--		# Now convert al l the headers (would normally have been done in readHeadersAndContent)
--		convHeaders = {}
--		for headerName, headerValue in headers.items():
--			convHeaders [pageCharSetDecoder(headerName)[0]] = pageCharSetDecoder (headerValue)[0]
--		
-+		headers, rawContent = self.readHeadersAndContent (page)
-+		content = textile.textile (rawContent)
- 		actualHeaders = pageMap ['headers']
--		actualHeaders.update (convHeaders)
-+		actualHeaders.update (headers)
- 		pageMap ['headers'] = actualHeaders
- 		pageMap ['content'] = content
--		# Raw content wasn't converted
--		pageMap ['rawContent'] = pageCharSetDecoder (rawContent)[0]
-+		pageMap ['rawContent'] = rawContent
- 		
- 		return pageMap
--		
-\ No newline at end of file
-+