[gtk-mac-bundler] Clean out trailing whitespace.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-mac-bundler] Clean out trailing whitespace.
- Date: Sun, 8 Jan 2017 02:07:31 +0000 (UTC)
commit 10bd6e4161df01bd4299910ca9b38048c5e248e4
Author: John Ralls <jralls ceridwen us>
Date: Fri Dec 30 12:52:29 2016 -0800
Clean out trailing whitespace.
bundler/bundler.py | 14 +++++++-------
bundler/project.py | 17 ++++++++---------
bundler/utils.py | 2 +-
3 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/bundler/bundler.py b/bundler/bundler.py
index ef19d37..f97b89c 100644
--- a/bundler/bundler.py
+++ b/bundler/bundler.py
@@ -37,7 +37,7 @@ class Bundler:
if not os.path.exists(dirname):
return
-
+
files = os.listdir(dirname)
for file in files:
path = os.path.join (dirname, file)
@@ -145,7 +145,7 @@ class Bundler:
cmd = "GTK_EXE_PREFIX=" + path + " gtk-query-immodules-" + self.project.get_gtk_version()
f = os.popen(cmd)
- path = self.project.get_bundle_path("Contents/Resources/etc/",
+ path = self.project.get_bundle_path("Contents/Resources/etc/",
self.project.get_gtk_dir())
utils.makedirs(path)
fout = open(os.path.join(path, "gtk.immodules"), "w")
@@ -168,21 +168,21 @@ class Bundler:
def create_gdk_pixbuf_loaders_setup(self):
modulespath = ""
cachepath = ""
- if os.path.exists(os.path.join(self.project.get_prefix(), "lib",
+ if os.path.exists(os.path.join(self.project.get_prefix(), "lib",
"gdk-pixbuf-2.0")):
modulespath = self.project.get_bundle_path("Contents/Resources/lib/",
- "gdk-pixbuf-2.0",
+ "gdk-pixbuf-2.0",
"${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}",
"loaders")
cachepath = self.project.get_bundle_path("Contents/Resources/lib/",
"gdk-pixbuf-2.0",
"${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}",
"loaders.cache")
- elif os.path.exists(os.path.join(self.project.get_prefix(), "lib",
+ elif os.path.exists(os.path.join(self.project.get_prefix(), "lib",
"gdk-pixbuf-3.0")):
modulespath = self.project.get_bundle_path("Contents/Resources/lib/",
- "gdk-pixbuf-3.0",
+ "gdk-pixbuf-3.0",
"${pkg:gdk-pixbuf-3.0:gdk_pixbuf_binary_version}",
"loaders")
cachepath = self.project.get_bundle_path("Contents/Resources/lib/",
@@ -673,7 +673,7 @@ class Bundler:
# Data
for path in self.project.get_data():
self.copy_path(path)
-
+
# Translations
self.copy_translations()
diff --git a/bundler/project.py b/bundler/project.py
index 581f8a4..55930c2 100644
--- a/bundler/project.py
+++ b/bundler/project.py
@@ -20,7 +20,7 @@ class Path:
source = os.path.normpath(source)
if dest and os.path.isabs(dest):
dest = os.path.normpath(dest)
-
+
self.source = source
self.dest = dest
self.recurse = recurse
@@ -37,7 +37,7 @@ class Path:
recurse = False
if validate:
Path.validate(source, dest)
-
+
return Path(source, dest, recurse)
from_node = classmethod(from_node)
@@ -49,7 +49,7 @@ class Path:
if not source or len(source) == 0:
raise Exception("The source path cannot be empty")
-
+
if source.startswith("${bundle}"):
raise Exception("The source path cannot use a ${bundle} macro")
@@ -114,7 +114,7 @@ class Meta:
child = utils.node_get_element_by_tag_name(node, "image")
if child:
pass # FIXME: implement
-
+
child = utils.node_get_element_by_tag_name(node, "run-install-name-tool")
if child:
self.run_install_name_tool = True
@@ -192,7 +192,7 @@ class Data(Path):
class IconTheme:
ICONS_NONE, ICONS_ALL, ICONS_AUTO = list(range(3))
-
+
def __init__(self, name, icons=ICONS_AUTO):
self.name = name
self.source = "${prefix}/share/icons/" + name
@@ -203,7 +203,7 @@ class IconTheme:
name = utils.node_get_string(node)
if not name:
raise Exception("Icon theme must have a 'name' property")
-
+
string = node.getAttribute("icons")
if string == "all":
icons = IconTheme.ICONS_ALL
@@ -211,7 +211,7 @@ class IconTheme:
icons = IconTheme.ICONS_NONE
elif string == "auto" or len(string) == 0:
icons = IconTheme.ICONS_AUTO
-
+
return IconTheme(name, icons)
from_node = classmethod(from_node)
@@ -425,7 +425,7 @@ class Project:
for node in nodes:
data.append(Data.from_node(node))
return data
-
+
if __name__ == '__main__':
project = Project(os.path.join(os.getcwd(), 'giggle.bundle'))
@@ -458,4 +458,3 @@ if __name__ == '__main__':
print("Binaries:")
for binary in project.get_binaries():
print(" %s => %s" % (binary.source, binary.dest))
-
diff --git a/bundler/utils.py b/bundler/utils.py
index 62b5140..e649885 100644
--- a/bundler/utils.py
+++ b/bundler/utils.py
@@ -72,7 +72,7 @@ def node_get_elements_by_tag_name(node, name):
def node_get_element_by_tag_name(node, name):
try:
(data,) = node.getElementsByTagName(name)
- return data
+ return data
except:
return None
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]