aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/workbench.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-11-24 15:24:58 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-11-24 15:24:58 -0600
commit99d2ac1d83962fb4dc38f01d63d2ad4036226765 (patch)
tree5c8a3a8c6f7ee5ea3662a6c791855864c5784e1a /mediagoblin/workbench.py
parent30188321531e1b0d3c78166498702bbd8c7dc2bc (diff)
parent6506b1e22c70b55a73ee4cb391aebaf73db79ef9 (diff)
downloadmediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.tar.lz
mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.tar.xz
mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.zip
Merge remote-tracking branch 'remotes/jwandborg/master'
Diffstat (limited to 'mediagoblin/workbench.py')
-rw-r--r--mediagoblin/workbench.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/workbench.py b/mediagoblin/workbench.py
index 60a79f47..9578494c 100644
--- a/mediagoblin/workbench.py
+++ b/mediagoblin/workbench.py
@@ -47,7 +47,10 @@ class Workbench(object):
return str(self.dir)
def __repr__(self):
- return repr(self.dir)
+ try:
+ return str(self)
+ except AttributeError:
+ return 'None'
def joinpath(self, *args):
return os.path.join(self.dir, *args)