Merge lp:~matttbe/wicd/ubuntu_python27 into lp:ubuntu/natty/wicd

[Matthieu Baerts]

Wicd-daemon won't work since we use python 2.7 as default.

This branch propose a new patch mentioned on bug #602825 and applied on wicd-devel branch (and available on wicd 1.7.1 beta 2).

Please pull (or 'merge' or 'merge --pull') this branch on lp:ubuntu/wicd to fix this annoying bug :)

Thank you

[Stefano Rivera (stefanor)]

No need to bump the standards version, we try not to deviate from Debian unnecessarily.

Also, in the future, please add descriptive headers to patches, i.e. DEP3 http://dep.debian.net/deps/dep3/

review: Needs Fixing

[Matthieu Baerts (matttbe)]

Thank you for your help!

I've overwrote my commit and push it. I hope everything is now correct! :)

[Stefano Rivera (stefanor)]

One more issue, the patch you added is a -p0 patch, but quilt expects -p1, so it won't apply and the build fails.

Suggestion: change debian/patches/series to say "31-deepcopy+python27-fixes.patch -p0"
then run: quilt push; quilt refresh

That should leave you with a -p1 patch.

review: Needs Fixing

[lp:~matttbe/wicd/ubuntu_python27]

18. By Matthieu Baerts on 2010-12-11

* debian/patches/
 - Added 31-deepcopy+python27-fixes.patch for python 2.7
   (credit to Archlinux and Remy Oudompheng - LP: #602825)

[Matthieu Baerts (matttbe)]

Thank you Stefano!
I've recreated the patch correctly. I think it's much better now!

=== added directory '.pc/31-deepcopy+python27-fixes.patch'
=== added directory '.pc/31-deepcopy+python27-fixes.patch/wicd'
=== added file '.pc/31-deepcopy+python27-fixes.patch/wicd/configmanager.py'
--- .pc/31-deepcopy+python27-fixes.patch/wicd/configmanager.py	1970-01-01 00:00:00 +0000
+++ .pc/31-deepcopy+python27-fixes.patch/wicd/configmanager.py	2010-12-11 12:25:11 +0000
@@ -0,0 +1,212 @@
+#!/usr/bin/env python
+
+""" configmanager -- Wicd configuration file manager
+
+Wrapper around ConfigParser for wicd, though it should be
+reusable for other purposes as well.
+
+"""
+
+#
+#   Copyright (C) 2008-2009 Adam Blackburn
+#   Copyright (C) 2008-2009 Dan O'Reilly
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License Version 2 as
+#   published by the Free Software Foundation.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os, copy
+
+from ConfigParser import RawConfigParser, ParsingError
+
+from wicd.misc import Noneify, to_unicode
+
+from dbus import Int32
+
+class ConfigManager(RawConfigParser):
+    """ A class that can be used to manage a given configuration file. """
+    def __init__(self, path, debug=False, mark_whitespace="`'`"):
+        RawConfigParser.__init__(self)
+        self.config_file = path
+        self.debug = debug
+        self.mrk_ws = mark_whitespace
+        try:
+            self.read(path)
+        except ParsingError, e:
+            self.write()
+            try:
+                self.read(path)
+            except ParsingError, p:
+                import sys
+                print "Could not start wicd: %s" % p.message
+                sys.exit(1)
+
+    def __repr__(self):
+        return self.config_file
+    
+    def __str__(self):
+        return self.config_file
+    
+    def get_config(self):
+        """ Returns the path to the loaded config file. """
+        return self.config_file
+        
+    def set_option(self, section, option, value, write=False):
+        """ Wrapper around ConfigParser.set
+
+        Adds the option to write the config file change right away.
+        Also forces all the values being written to type str, and
+        adds the section the option should be written to if it
+        doesn't exist already.
+        
+        """
+        if not self.has_section(section):
+            self.add_section(section)
+        if isinstance(value, basestring):
+            value = to_unicode(value)
+            if value.startswith(' ') or value.endswith(' '):
+                value = "%(ws)s%(value)s%(ws)s" % {"value" : value,
+                                                   "ws" : self.mrk_ws}
+        RawConfigParser.set(self, section, str(option), value)
+        if write:
+            self.write()
+
+    def set(self, *args, **kargs):
+        """ Calls the set_option method. """
+        self.set_option(*args, **kargs)
+        
+    def get_option(self, section, option, default="__None__"):
+        """ Wrapper around ConfigParser.get. 
+        
+        Automatically adds any missing sections, adds the ability
+        to write a default value, and if one is provided prints if
+        the default or a previously saved value is returned.
+        
+        """
+        if not self.has_section(section):
+            if default != "__None__":
+                self.add_section(section)
+            else:
+                return None
+    
+        if self.has_option(section, option):
+            ret = RawConfigParser.get(self, section, option)
+            if (isinstance(ret, basestring) and ret.startswith(self.mrk_ws) 
+                and ret.endswith(self.mrk_ws)):
+                ret = ret[3:-3]
+            if default:
+                if self.debug:
+                    print ''.join(['found ', option, ' in configuration ', 
+                                   str(ret)])
+        else:
+            if default != "__None__":
+                print 'did not find %s in configuration, setting default %s' % (option, str(default))
+                self.set(section, option, str(default), write=True)
+                ret = default
+            else:
+                ret = None
+        
+        # Try to intelligently handle the type of the return value.
+        try:
+            if not ret.startswith('0') or len(ret) == 1:
+                ret = int(ret)
+        except (ValueError, TypeError, AttributeError):
+            ret = Noneify(ret)
+        # This is a workaround for a python-dbus issue on 64-bit systems.
+        if isinstance(ret, (int, long)):
+            try:
+                Int32(ret)
+            except OverflowError:
+                ret = str(ret)
+        return to_unicode(ret)
+    
+    def get(self, *args, **kargs):
+        """ Calls the get_option method """
+        return self.get_option(*args, **kargs)
+    
+    def _write_one(self):
+        """ Writes the loaded config file to disk. """
+        for section in self.sections():
+            if not section:
+                self.remove_section(section)
+        configfile = open(self.config_file, 'w')
+        RawConfigParser.write(self, configfile)
+        configfile.close()
+        
+    def remove_section(self, section):
+        """ Wrapper around the ConfigParser.remove_section() method.
+        
+        This method only calls the ConfigParser.remove_section() method
+        if the section actually exists.
+        
+        """
+        if self.has_section(section):
+            RawConfigParser.remove_section(self, section)
+            
+    def reload(self):
+        """ Re-reads the config file, in case it was edited out-of-band. """
+        self.read(self.config_file)
+
+    def read(self, path):
+        """ Reads the config file specified by 'path' then reads all the
+        files in the directory obtained by adding '.d' to 'path'. The files
+        in the '.d' directory are read in normal sorted order and section
+        entries in these files override entries in the main file.
+        """
+        RawConfigParser.read(self, path)
+
+        path_d = path + ".d"
+        files = []
+
+        if os.path.exists(path_d):
+            files = [ os.path.join(path_d, f) for f in os.listdir(path_d) ]
+            files.sort()
+
+        for fname in files:
+            p = RawConfigParser()
+            p.read(fname)
+            for section_name in p.sections():
+                # New files override old, so remove first to avoid DuplicateSectionError.
+                self.remove_section(section_name)
+                self.add_section(section_name)
+                for (name, value) in p.items(section_name):
+                    self.set(section_name, name, value)
+                # Store the filename this section was read from.
+                self.set(section_name, '_filename_', fname)
+
+
+    def _copy_section(self, name):
+        # Yes, deepcopy sucks, but it is robust to changes in both
+        # this class and RawConfigParser.
+        p = copy.deepcopy(self)
+        for sname in p.sections():
+            if sname != name:
+                p.remove_section(sname)
+        p.config_file = p.get_option(name, '_filename_', p.config_file)
+        p.remove_option(name, '_filename_')
+        return p
+
+    def write(self):
+        """ Writes the loaded config file to disk. """
+        # Really don't like this deepcopy.
+        p = copy.deepcopy(self)
+        for sname in p.sections():
+            fname = p.get_option(sname, '_filename_')
+            if fname and fname != self.config_file:
+                section = self._copy_section(sname)
+                p.remove_section(sname)
+                section._write_one()
+
+        for sname in p.sections():
+            p.remove_option(sname, '_filename_')
+        p._write_one()
+

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-05-29 09:17:32 +0000
+++ .pc/applied-patches	2010-12-11 12:25:11 +0000
@@ -17,3 +17,4 @@
 28-announce_dhclient.conf.template.patch
 29-document_variables_passed_to_scripts.patch
 30-make_connection_info_selectable.patch
+31-deepcopy+python27-fixes.patch

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-29 09:17:32 +0000
+++ debian/changelog	2010-12-11 12:25:11 +0000
@@ -1,3 +1,11 @@
+wicd (1.7.0+ds1-5ubuntu1) natty; urgency=low
+
+  * debian/patches/
+   - Added 31-deepcopy+python27-fixes.patch for python 2.7
+     (credit to Archlinux and Remy Oudompheng - LP: #602825)
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Sat, 11 Dec 2010 13:22:08 +0100
+
 wicd (1.7.0+ds1-5) unstable; urgency=medium
 
   * debian/patches/series:

=== added file 'debian/patches/31-deepcopy+python27-fixes.patch'
--- debian/patches/31-deepcopy+python27-fixes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/31-deepcopy+python27-fixes.patch	2010-12-11 12:25:11 +0000
@@ -0,0 +1,88 @@
+From: Matthieu Baerts <[e-mail]>
+Subject: Added the compatibility with python2.7
+Origin: vendor, http://repos.archlinux.org/wsvn/packages/wicd/trunk/deepcopy%2Bpython27-fixes.patch
+Origin: upstream, http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/564
+Bug: https://bugs.launchpad.net/wicd/+bug/602825
+Forwarded: yes
+
+Index: wicd/wicd/configmanager.py
+===================================================================
+--- wicd.orig/wicd/configmanager.py	2010-12-11 13:12:12.755976821 +0100
++++ wicd/wicd/configmanager.py	2010-12-11 13:12:32.636294327 +0100
+@@ -24,7 +24,7 @@
+ #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
+-import os, copy
++import sys, os, copy
+ 
+ from ConfigParser import RawConfigParser, ParsingError
+ 
+@@ -35,7 +35,10 @@
+ class ConfigManager(RawConfigParser):
+     """ A class that can be used to manage a given configuration file. """
+     def __init__(self, path, debug=False, mark_whitespace="`'`"):
+-        RawConfigParser.__init__(self)
++        if sys.version_info >= (2, 7, 0):
++            RawConfigParser.__init__(self, allow_no_value=True)
++        else:
++            RawConfigParser.__init__(self)
+         self.config_file = path
+         self.debug = debug
+         self.mrk_ws = mark_whitespace
+@@ -46,7 +49,6 @@
+             try:
+                 self.read(path)
+             except ParsingError, p:
+-                import sys
+                 print "Could not start wicd: %s" % p.message
+                 sys.exit(1)
+ 
+@@ -185,28 +187,35 @@
+ 
+ 
+     def _copy_section(self, name):
+-        # Yes, deepcopy sucks, but it is robust to changes in both
+-        # this class and RawConfigParser.
+-        p = copy.deepcopy(self)
+-        for sname in p.sections():
+-            if sname != name:
+-                p.remove_section(sname)
++        p = ConfigManager("", self.debug, self.mrk_ws)
++        p.add_section(name)
++        for (iname, value) in self.items(name):
++            p.set(name, iname, value)
++        # Store the filename this section was read from.
+         p.config_file = p.get_option(name, '_filename_', p.config_file)
+         p.remove_option(name, '_filename_')
+         return p
+ 
+     def write(self):
+         """ Writes the loaded config file to disk. """
+-        # Really don't like this deepcopy.
+-        p = copy.deepcopy(self)
+-        for sname in p.sections():
+-            fname = p.get_option(sname, '_filename_')
++        in_this_file = []
++        for sname in self.sections():
++            fname = self.get_option(sname, '_filename_')
+             if fname and fname != self.config_file:
++                # Write sections from other files
+                 section = self._copy_section(sname)
+-                p.remove_section(sname)
+                 section._write_one()
++            else:
++                # Save names of local sections
++                in_this_file.append(sname)
+ 
+-        for sname in p.sections():
++        # Make an instance with only these sections
++        p = ConfigManager("", self.debug, self.mrk_ws)
++        p.config_file = self.config_file
++        for sname in in_this_file:
++            p.add_section(sname)
++            for (iname, value) in self.items(sname):
++                p.set(sname, iname, value)
+             p.remove_option(sname, '_filename_')
+         p._write_one()
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-05-29 09:17:32 +0000
+++ debian/patches/series	2010-12-11 12:25:11 +0000
@@ -21,3 +21,4 @@
 28-announce_dhclient.conf.template.patch
 29-document_variables_passed_to_scripts.patch
 30-make_connection_info_selectable.patch
+31-deepcopy+python27-fixes.patch

=== modified file 'wicd/configmanager.py'
--- wicd/configmanager.py	2010-03-05 18:12:51 +0000
+++ wicd/configmanager.py	2010-12-11 12:25:11 +0000
@@ -24,7 +24,7 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import os, copy
+import sys, os, copy
 
 from ConfigParser import RawConfigParser, ParsingError
 
@@ -35,7 +35,10 @@
 class ConfigManager(RawConfigParser):
     """ A class that can be used to manage a given configuration file. """
     def __init__(self, path, debug=False, mark_whitespace="`'`"):
-        RawConfigParser.__init__(self)
+        if sys.version_info >= (2, 7, 0):
+            RawConfigParser.__init__(self, allow_no_value=True)
+        else:
+            RawConfigParser.__init__(self)
         self.config_file = path
         self.debug = debug
         self.mrk_ws = mark_whitespace
@@ -46,7 +49,6 @@
             try:
                 self.read(path)
             except ParsingError, p:
-                import sys
                 print "Could not start wicd: %s" % p.message
                 sys.exit(1)
 
@@ -185,28 +187,35 @@
 
 
     def _copy_section(self, name):
-        # Yes, deepcopy sucks, but it is robust to changes in both
-        # this class and RawConfigParser.
-        p = copy.deepcopy(self)
-        for sname in p.sections():
-            if sname != name:
-                p.remove_section(sname)
+        p = ConfigManager("", self.debug, self.mrk_ws)
+        p.add_section(name)
+        for (iname, value) in self.items(name):
+            p.set(name, iname, value)
+        # Store the filename this section was read from.
         p.config_file = p.get_option(name, '_filename_', p.config_file)
         p.remove_option(name, '_filename_')
         return p
 
     def write(self):
         """ Writes the loaded config file to disk. """
-        # Really don't like this deepcopy.
-        p = copy.deepcopy(self)
-        for sname in p.sections():
-            fname = p.get_option(sname, '_filename_')
+        in_this_file = []
+        for sname in self.sections():
+            fname = self.get_option(sname, '_filename_')
             if fname and fname != self.config_file:
+                # Write sections from other files
                 section = self._copy_section(sname)
-                p.remove_section(sname)
                 section._write_one()
+            else:
+                # Save names of local sections
+                in_this_file.append(sname)
 
-        for sname in p.sections():
+        # Make an instance with only these sections
+        p = ConfigManager("", self.debug, self.mrk_ws)
+        p.config_file = self.config_file
+        for sname in in_this_file:
+            p.add_section(sname)
+            for (iname, value) in self.items(sname):
+                p.set(sname, iname, value)
             p.remove_option(sname, '_filename_')
         p._write_one()