[caribou] Fix gschema generation with Python 3



commit 7910e5ecc870f50a864c887472f60dd054967da9
Author: Daiki Ueno <dueno src gnome org>
Date:   Tue Nov 4 12:08:38 2014 +0900

    Fix gschema generation with Python 3
    
    https://bugzilla.gnome.org/show_bug.cgi?id=722634

 caribou/antler/__init__.py        |    2 +-
 caribou/settings/__init__.py      |    2 +-
 caribou/settings/setting_types.py |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/caribou/antler/__init__.py b/caribou/antler/__init__.py
index e5b9ab5..e68a1dc 100644
--- a/caribou/antler/__init__.py
+++ b/caribou/antler/__init__.py
@@ -1 +1 @@
-from antler_settings import AntlerSettings
+from .antler_settings import AntlerSettings
diff --git a/caribou/settings/__init__.py b/caribou/settings/__init__.py
index 0ec8b40..c906b22 100644
--- a/caribou/settings/__init__.py
+++ b/caribou/settings/__init__.py
@@ -1,5 +1,5 @@
 GSETTINGS_SCHEMA = "org.gnome.caribou"
 
-from caribou_settings import CaribouSettings
+from .caribou_settings import CaribouSettings
 
 AllSettings = [CaribouSettings]
diff --git a/caribou/settings/setting_types.py b/caribou/settings/setting_types.py
index f6a0503..42e40cc 100644
--- a/caribou/settings/setting_types.py
+++ b/caribou/settings/setting_types.py
@@ -93,7 +93,7 @@ class ValueSetting(Setting):
     def value(self, val):
         _val = self.convert_value(val)
         if self.allowed and _val not in [a for a, b in self.allowed]:
-            raise ValueError, "'%s' not a valid value" % _val
+            raise ValueError("'%s' not a valid value" % _val)
         self._value = _val
         if not self.hush:
             self.emit('value-changed', _val)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]