[Sugar-devel] [PATCH sugar-toolkit-gtk3 1/3] Remove a few unused keywords

Daniel Narvaez dwnarvaez at gmail.com
Wed Dec 5 19:32:35 EST 2012


From: Daniel Narvaez <dwnarvaez at gmail.com>

---
 src/sugar3/activity/bundlebuilder.py |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/sugar3/activity/bundlebuilder.py b/src/sugar3/activity/bundlebuilder.py
index 1450ec2..7e54152 100644
--- a/src/sugar3/activity/bundlebuilder.py
+++ b/src/sugar3/activity/bundlebuilder.py
@@ -64,10 +64,9 @@ def list_files(base_dir, ignore_dirs=None, ignore_files=None):
 
 class Config(object):
 
-    def __init__(self, source_dir=None, dist_dir=None, dist_name=None):
-        self.source_dir = source_dir or os.getcwd()
-        self.dist_dir = dist_dir or os.path.join(self.source_dir, 'dist')
-        self.dist_name = dist_name
+    def __init__(self):
+        self.source_dir = os.getcwd()
+        self.dist_dir = os.path.join(self.source_dir, 'dist')
         self.bundle = None
         self.version = None
         self.activity_name = None
@@ -90,12 +89,8 @@ class Config(object):
         self.bundle_name = reduce(operator.add, self.activity_name.split())
         self.bundle_root_dir = self.bundle_name + '.activity'
         self.tar_root_dir = '%s-%s' % (self.bundle_name, self.version)
-
-        if self.dist_name:
-            self.xo_name = self.tar_name = self.dist_name
-        else:
-            self.xo_name = '%s-%s.xo' % (self.bundle_name, self.version)
-            self.tar_name = '%s-%s.tar.bz2' % (self.bundle_name, self.version)
+        self.xo_name = '%s-%s.xo' % (self.bundle_name, self.version)
+        self.tar_name = '%s-%s.tar.bz2' % (self.bundle_name, self.version)
 
 
 class Builder(object):
-- 
1.7.10.4



More information about the Sugar-devel mailing list