[Python-apps-commits] r4197 - in packages/boa-constructor/trunk/debian (5 files)

Fri Nov 27 22:58:29 UTC 2009

Date: Friday, November 27, 2009 @ 22:58:28
  Author: dktrkranz
Revision: 4197

Do not install embedded tarfile, zipfile and xmlrpclib modules

Added:
  packages/boa-constructor/trunk/debian/patches/stdlib.patch
Modified:
  packages/boa-constructor/trunk/debian/changelog
  packages/boa-constructor/trunk/debian/patches/no_maxint.patch
  packages/boa-constructor/trunk/debian/patches/series
  packages/boa-constructor/trunk/debian/rules

Modified: packages/boa-constructor/trunk/debian/changelog
===================================================================

--- packages/boa-constructor/trunk/debian/changelog	2009-11-27 21:54:39 UTC (rev 4196)
+++ packages/boa-constructor/trunk/debian/changelog	2009-11-27 22:58:28 UTC (rev 4197)
@@ -1,3 +1,16 @@
+boa-constructor (0.6.1-9) unstable; urgency=low
+
+  * Do not install embedded tarfile, zipfile and xmlrpclib modules, they
+    are provided by stdlib (closes: #556355):
+    + debian/patches/stdlib.patch:
+      - Adjust files to load modules from stdlib.
+    + debian/patches/no_maxint.patch:
+      - Drop change on tarfile.py, it will not be installed anymore.
+    + debian/rules:
+      - Exclude affected files from the package.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Fri, 27 Nov 2009 23:45:10 +0100
+
 boa-constructor (0.6.1-8) unstable; urgency=low
 
   * Do not install embedded pyparsing module, suggest python-pyparsing

Modified: packages/boa-constructor/trunk/debian/patches/no_maxint.patch
===================================================================
--- packages/boa-constructor/trunk/debian/patches/no_maxint.patch	2009-11-27 21:54:39 UTC (rev 4196)
+++ packages/boa-constructor/trunk/debian/patches/no_maxint.patch	2009-11-27 22:58:28 UTC (rev 4197)
@@ -16,19 +16,6 @@
      
  class RowColDTC(HelperDTC):
      propName = 'Prop'
-Index: boa-constructor-0.6.1/ExternalLib/tarfile.py
-===================================================================
---- boa-constructor-0.6.1.orig/ExternalLib/tarfile.py	2009-04-11 16:52:51.000000000 +0200
-+++ boa-constructor-0.6.1/ExternalLib/tarfile.py	2009-04-11 16:54:29.000000000 +0200
-@@ -1684,7 +1684,7 @@
-            be mixed up (!).
-         """
-         if size < 0:
--            size = sys.maxint
-+            size = 2L**31-1
- 
-         nl = self.linebuffer.find("\n")
-         if nl >= 0:
 Index: boa-constructor-0.6.1/PropEdit/InspectorEditorControls.py
 ===================================================================
 --- boa-constructor-0.6.1.orig/PropEdit/InspectorEditorControls.py	2009-04-11 16:52:52.000000000 +0200

Modified: packages/boa-constructor/trunk/debian/patches/series
===================================================================
--- packages/boa-constructor/trunk/debian/patches/series	2009-11-27 21:54:39 UTC (rev 4196)
+++ packages/boa-constructor/trunk/debian/patches/series	2009-11-27 22:58:28 UTC (rev 4197)
@@ -2,3 +2,4 @@
 executable_script_fixup.patch
 no_maxint.patch
 no_double_free.patch
+stdlib.patch

Added: packages/boa-constructor/trunk/debian/patches/stdlib.patch
===================================================================
--- packages/boa-constructor/trunk/debian/patches/stdlib.patch	                        (rev 0)
+++ packages/boa-constructor/trunk/debian/patches/stdlib.patch	2009-11-27 22:58:28 UTC (rev 4197)
@@ -0,0 +1,58 @@
+Index: boa-constructor-0.6.1/Explorers/ZipExplorer.py
+===================================================================
+--- boa-constructor-0.6.1.orig/Explorers/ZipExplorer.py	2009-11-27 23:34:00.364266648 +0100
++++ boa-constructor-0.6.1/Explorers/ZipExplorer.py	2009-11-27 23:33:56.272263118 +0100
+@@ -21,7 +21,7 @@
+ import ExplorerNodes, FileExplorer
+ from Models import EditorModels, EditorHelper
+ 
+-from ExternalLib import tarfile
++import tarfile
+ 
+ def isZip(file):
+     return os.path.splitext(file)[1] == '.zip'
+Index: boa-constructor-0.6.1/ZopeLib/ZopeEditorModels.py
+===================================================================
+--- boa-constructor-0.6.1.orig/ZopeLib/ZopeEditorModels.py	2009-11-27 23:42:25.880265232 +0100
++++ boa-constructor-0.6.1/ZopeLib/ZopeEditorModels.py	2009-11-27 23:42:14.524259391 +0100
+@@ -97,7 +97,7 @@
+             on saving are caught and transformed to TransportSaveErrors.
+             To much maintenance for every Node type to add exceptions
+         """
+-        from ExternalLib.xmlrpclib import Fault
++        from xmlrpclib import Fault
+         try:
+             EditorModels.BasePersistentModel.save(self, overwriteNewer)
+         except Fault, err:
+Index: boa-constructor-0.6.1/ZopeLib/ZopeExplorer.py
+===================================================================
+--- boa-constructor-0.6.1.orig/ZopeLib/ZopeExplorer.py	2009-11-27 23:42:26.360265103 +0100
++++ boa-constructor-0.6.1/ZopeLib/ZopeExplorer.py	2009-11-27 23:42:03.676265429 +0100
+@@ -14,11 +14,12 @@
+ import os, urllib, urlparse, time, socket
+ from thread import start_new_thread
+ 
+-import wx
++import wx
++import xmlrpclib
+ 
+ from Explorers import ExplorerNodes
+ from Models import EditorHelper, Controllers
+-from ExternalLib import xmlrpclib, BasicAuthTransport
++from ExternalLib import BasicAuthTransport
+ from Preferences import IS
+ import Utils, Preferences
+ import Views, Views.SourceViews, Views.PySourceView
+Index: boa-constructor-0.6.1/ZopeLib/ZopeViews.py
+===================================================================
+--- boa-constructor-0.6.1.orig/ZopeLib/ZopeViews.py	2009-11-27 23:42:26.108268260 +0100
++++ boa-constructor-0.6.1/ZopeLib/ZopeViews.py	2009-11-27 23:40:49.028266685 +0100
+@@ -22,7 +22,7 @@
+ 
+ import Utils, ErrorStack
+ 
+-from ExternalLib import xmlrpclib
++import xmlrpclib
+ 
+ # Can be extended by plug-ins, used by syntax highlighted styles
+ zope_additional_attributes = ''

Modified: packages/boa-constructor/trunk/debian/rules
===================================================================
--- packages/boa-constructor/trunk/debian/rules	2009-11-27 21:54:39 UTC (rev 4196)
+++ packages/boa-constructor/trunk/debian/rules	2009-11-27 22:58:28 UTC (rev 4197)
@@ -14,7 +14,7 @@
 	cd Docs/boa.apphelp; patch -p1 < ../../debian/patches/docs_typo.patch
 	cd Docs/boa.apphelp; zip -q ../boa.apphelp.htb *
 	rm -fr Docs/boa.apphelp
-	dh_install -Xboa.apphelp.htb.orig -Xpyparsing.py -XConfigParser.py
+	dh_install -Xboa.apphelp.htb.orig -Xpyparsing.py -Xtarfile.py -Xxmlrpclib.py -Xzipfile.py -XConfigParser.py
 
 override_dh_pysupport:
 	dh_pysupport -X zoa


