Matthias Vogelgesang 8 yıl önce
ebeveyn
işleme
d538c151ae
2 değiştirilmiş dosya ile 40 ekleme ve 40 silme
  1. 11 11
      concert_astor/proposal.py
  2. 29 29
      concert_astor/workspace.py

+ 11 - 11
concert_astor/proposal.py

@@ -5,17 +5,17 @@ from concert.networking.base import get_tango_device
 
 class Emma(object):
 
-	def __init__(self, uri='anka/astor/emma'):
-		self.device = get_tango_device(uri)
+    def __init__(self, uri='anka/astor/emma'):
+        self.device = get_tango_device(uri)
 
-	@property
-	def running(self):
-		return self.device.State() == PyTango._PyTango.DevState.RUNNING
+    @property
+    def running(self):
+        return self.device.State() == PyTango._PyTango.DevState.RUNNING
 
-	@property
-	def proposal_id(self):
-		return self.device.ProposalId
+    @property
+    def proposal_id(self):
+        return self.device.ProposalId
 
-	@property
-	def metadata(self):
-		return json.loads(self.device.ProposalMetadata)
+    @property
+    def metadata(self):
+        return json.loads(self.device.ProposalMetadata)

+ 29 - 29
concert_astor/workspace.py

@@ -1,49 +1,49 @@
 import os
+import json
 from concert.networking.base import get_tango_device
 
 
 class Workspace(object):
 
-	# FIXME: we should actually get absolute paths
-	ROOT = os.path.expanduser('~')
+    # FIXME: we should actually get absolute paths
+    ROOT = os.path.expanduser('~')
 
-	def __init__(self, penny, name):
-		self.penny = penny
-		self.name = name
+    def __init__(self, penny, name):
+        self.penny = penny
+        self.name = name
 
-	@property
-	def path(self):
-		return os.path.join(self.ROOT, self.penny.device.GetPath(self.name))
+    @property
+    def path(self):
+        return os.path.join(self.ROOT, self.penny.device.GetPath(self.name))
 
-	def close(self):
-		self.penny.close(self.name)
+    def close(self):
+        self.penny.close(self.name)
 
-	def free(self):
-		self.penny.free(self.name)
+    def free(self):
+        self.penny.free(self.name)
 
-	def delete(self):
-		self.penny.delete(self.name)
+    def delete(self):
+        self.penny.delete(self.name)
 
 
 class Penny(object):
 
-	def __init__(self, uri='anka/astor/penny'):
-		self.device = get_tango_device(uri)
+    def __init__(self, uri='anka/astor/penny'):
+        self.device = get_tango_device(uri)
 
-	@property
-	def workspaces(self):
-		return json.loads(self.device.WorkspaceList).keys()
+    @property
+    def workspaces(self):
+        return json.loads(self.device.WorkspaceList).keys()
 
-	def create(self, name):
-		self.device.Create(name)
-		return Workspace(self, name)
+    def create(self, name):
+        self.device.Create(name)
+        return Workspace(self, name)
 
-	def close(self, name):
-		self.device.Close(name)
+    def close(self, name):
+        self.device.Close(name)
 
-	def free(self, name):
-		self.device.Free(name)
-
-	def delete(self, name):
-		self.device.Delete(name)
+    def free(self, name):
+        self.device.Free(name)
 
+    def delete(self, name):
+        self.device.Delete(name)