Merge pull request #410 from SuperCowPowers/v0.3.4-alpha

V0.3.4 alpha
SuperCowPowers · Nov 23, 2014 · ad780f4 · ad780f4
2 parents 1d328ed + 759272e
commit ad780f4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -37,3 +37,9 @@ History
 ^^^^^^^^^^^^^^^^^^
 
 * Release of workbench for alpha developers and users.
+
+0.3.4 (2014-11-23)
+^^^^^^^^^^^^^^^^^^
+
+* Bug fixes related to 'drift' of python modules.
+* Release of workbench for alpha developers and users.
diff --git a/workbench_apps/workbench_cli/workbench b/workbench_apps/workbench_cli/workbench
@@ -3,13 +3,7 @@
 
 """Workbench Interactive Shell using IPython"""
 
-try:
-    import workbench_cli.workbench_shell as workbench_shell
-except (ImportError, ValueError):
-    try:
-        import workbench_apps.workbench_cli.workbench_shell as workbench_shell
-    except (ImportError, ValueError):
-    	import workbench_shell
+from workbench_apps.workbench_cli import workbench_shell
 
 def run():
     work_shell = workbench_shell.WorkbenchShell()

diff --git a/workbench_apps/workbench_cli/workbench_shell.py b/workbench_apps/workbench_cli/workbench_shell.py
@@ -132,7 +132,13 @@ def load_sample(self, file_path, tags=None):
         self.tags()
 
     def pivot(self, md5, tag=''):
-        '''Pivot on the md5e'''
+        """Pivot on an md5 (md5 can be a single sample or a sample_set)
+            Args:
+                md5: The md5 can be a single sample or a sample_set
+                tags (optional): a tag for the sample (for the prompt)
+            Returns:
+                Nothing but it's sets the active sample/sample_set
+        """
 
         # Is the md5 a tag?
         ss = self.workbench.generate_sample_set(md5)