[gtk-mac-bundler] Make bundler work with python 3.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-mac-bundler] Make bundler work with python 3.
- Date: Tue, 30 Jan 2018 00:12:50 +0000 (UTC)
commit 3a24b4383dba799811a4aa3cc16d0b8b7c0b1610
Author: John Ralls <jralls ceridwen us>
Date: Mon Jan 29 16:12:11 2018 -0800
Make bundler work with python 3.
bundler/bundler.py | 6 +++++-
bundler/project.py | 14 +++++++-------
2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/bundler/bundler.py b/bundler/bundler.py
index 13ebc65..9eba33f 100644
--- a/bundler/bundler.py
+++ b/bundler/bundler.py
@@ -1,3 +1,7 @@
+#from builtins import map
+#from builtins import filter
+#from past.builtins import basestring
+#from builtins import object
import sys
import os, errno, glob
import shutil
@@ -7,7 +11,7 @@ from plistlib import Plist
from .project import *
from . import utils
-class Bundler:
+class Bundler(object):
def __init__(self, project):
self.project = project
diff --git a/bundler/project.py b/bundler/project.py
index 799ec84..8cbcc58 100644
--- a/bundler/project.py
+++ b/bundler/project.py
@@ -50,7 +50,7 @@ class Path(object):
if node.tagName == "translations":
name = node.getAttribute('name')
if len(name) == 0:
- raise "The tag 'translations' must have a 'name' property."
+ raise ValueError("The tag 'translations' must have a 'name' property.")
return Translation(name, source, dest, recurse)
if node.tagName == "gir":
return GirFile(source, dest, recurse)
@@ -199,12 +199,12 @@ class Path(object):
return dest
# Used for anything that has a name and value.
-class Variable:
+class Variable(object):
def __init__(self, node):
self.name = node.getAttribute("name")
self.value = utils.node_get_string(node)
-class Environment:
+class Environment(object):
def __init__(self, node):
self.runtime_variables = []
self.scripts = []
@@ -218,7 +218,7 @@ class Environment:
script = Path(utils.node_get_string(child), "${bundle}/Resources/Scripts")
self.scripts.append(script)
-class Meta:
+class Meta(object):
def __init__(self, node):
self.prefixes = {}
@@ -357,7 +357,7 @@ class Translation(Path):
def copy_target(self, project):
if not self.name:
- raise "No program name to tranlate!"
+ raise ValueError("No program name to tranlate!")
def name_filter(filename):
name, ext = os.path.splitext(os.path.split(filename)[1])
@@ -367,7 +367,7 @@ class Translation(Path):
source = project.evaluate_path(self.source)
if source == None:
- raise "Failed to parse %s translation source!" % self.name
+ raise ValueError("Failed to parse %s translation source!" % self.name)
prefix = project.get_prefix()
for root, trees, files in os.walk(source):
for file in filter(name_filter, files):
@@ -472,7 +472,7 @@ class IconTheme(Path):
-class Project:
+class Project(object):
def __init__(self, project_path=None):
if not os.path.isabs(project_path):
project_path = os.path.join(os.getcwd(), project_path)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]