[Checkins] SVN: martian/trunk/src/martian/ Move some utility functions into util module.

[Martijn Faassen]

Log message for revision 76837:
  Move some utility functions into util module.
  

Changed:
  U   martian/trunk/src/martian/directive.py
  U   martian/trunk/src/martian/util.py

-=-
Modified: martian/trunk/src/martian/directive.py
===================================================================
--- martian/trunk/src/martian/directive.py	2007-06-20 12:36:46 UTC (rev 76836)
+++ martian/trunk/src/martian/directive.py	2007-06-20 12:47:08 UTC (rev 76837)
@@ -23,13 +23,6 @@
 from martian import util
 from martian.error import GrokImportError
 
-def frame_is_module(frame):
-    return frame.f_locals is frame.f_globals
-
-def frame_is_class(frame):
-    return '__module__' in frame.f_locals    
-
-
 class IDirectiveContext(interface.Interface):
     description = interface.Attribute("The correct place in which the "
                                       "directive can be used.")
@@ -45,7 +38,7 @@
     description = "class"
 
     def matches(self, frame):
-        return frame_is_class(frame)
+        return util.frame_is_class(frame)
 
     
 class ModuleDirectiveContext(object):
@@ -54,7 +47,7 @@
     description = "module"
 
     def matches(self, frame):
-        return frame_is_module(frame)
+        return util.frame_is_module(frame)
     
 
 class ClassOrModuleDirectiveContext(object):
@@ -63,7 +56,7 @@
     description = "class or module"
 
     def matches(self, frame):
-        return frame_is_module(frame) or frame_is_class(frame)
+        return util.frame_is_module(frame) or util.frame_is_class(frame)
 
 
 class Directive(object):

Modified: martian/trunk/src/martian/util.py
===================================================================
--- martian/trunk/src/martian/util.py	2007-06-20 12:36:46 UTC (rev 76836)
+++ martian/trunk/src/martian/util.py	2007-06-20 12:47:08 UTC (rev 76837)
@@ -155,3 +155,9 @@
                   if name != '__provides__' ]
     methods = [c for c in candidates if inspect.ismethod(c)]
     return methods
+
+def frame_is_module(frame):
+    return frame.f_locals is frame.f_globals
+
+def frame_is_class(frame):
+    return '__module__' in frame.f_locals