aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/workbench.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-11-18 09:34:09 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-11-18 09:34:09 -0600
commit817066506d846d06d0489dfb42b8200b86f61153 (patch)
tree36578ed7e5b2b205c919fcfb8929c8fc33a79c3f /mediagoblin/workbench.py
parent76c6c806caec7af20a3fe11c04bb783baacc3934 (diff)
parent3618a9ac5112c657fd095a0f9cbd346921a4e800 (diff)
downloadmediagoblin-817066506d846d06d0489dfb42b8200b86f61153.tar.lz
mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.tar.xz
mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.zip
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Conflicts: mediagoblin/templates/mediagoblin/user_pages/user.html
Diffstat (limited to 'mediagoblin/workbench.py')
-rw-r--r--mediagoblin/workbench.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/workbench.py b/mediagoblin/workbench.py
index 722f8e27..60a79f47 100644
--- a/mediagoblin/workbench.py
+++ b/mediagoblin/workbench.py
@@ -42,8 +42,10 @@ class Workbench(object):
def __unicode__(self):
return unicode(self.dir)
+
def __str__(self):
return str(self.dir)
+
def __repr__(self):
return repr(self.dir)
@@ -140,7 +142,7 @@ class WorkbenchManager(object):
self.base_workbench_dir = os.path.abspath(base_workbench_dir)
if not os.path.exists(self.base_workbench_dir):
os.makedirs(self.base_workbench_dir)
-
+
def create_workbench(self):
"""
Create and return the path to a new workbench (directory).