Переглянути джерело

Moved must_bo_open decorator to errors

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53973 15284696-431f-4ddb-bdfa-cd5b030d7da7
Luca Delucchi 12 роки тому
батько
коміт
ff2c116127
2 змінених файлів з 11 додано та 10 видалено
  1. 10 1
      lib/python/pygrass/errors.py
  2. 1 9
      lib/python/pygrass/vector/abstract.py

+ 10 - 1
lib/python/pygrass/errors.py

@@ -5,6 +5,7 @@ Created on Wed Aug 15 17:33:27 2012
 @author: pietro
 """
 
+from grass.script import warning
 
 class GrassError(Exception):
     def __init__(self, value):
@@ -19,4 +20,12 @@ class OpenError(Exception):
         self.value = value
 
     def __str__(self):
-        return repr(self.value)
+        return repr(self.value)
+
+def must_be_open(method):
+    def wrapper(self):
+        if self.is_open():
+            return method(self)
+        else:
+            warning(_("The map is close!"))
+    return wrapper

+ 1 - 9
lib/python/pygrass/vector/abstract.py

@@ -10,18 +10,10 @@ import grass.lib.vector as libvect
 from vector_type import MAPTYPE
 
 import pygrass.env as env
-from pygrass.errors import GrassError, OpenError
+from pygrass.errors import GrassError, OpenError, must_be_open
 from table import DBlinks
 
 
-def must_be_open(method):
-    def wrapper(self):
-        if self.is_open():
-            return method(self)
-        else:
-            print "You must open the map."
-    return wrapper
-
 
 #=============================================
 # VECTOR ABSTRACT CLASS