DB_composed_op: reorder functions

1 files changed, 13 insertions, 10 deletions

diff --git a/src/server/db_op.py b/src/server/db_op.py
index 3f6e5901..2fc7cefc 100644
--- a/src/server/db_op.py
+++ b/src/server/db_op.py
@@ -153,29 +153,32 @@ class DB_composed_op(DB_op):
     def __assert_false_statement_access(self):
         assert False, "composed_op may not contain statements, only sub-ops"
 
-    def add_statement(self, query, query_params={}):
-        self.__assert_false_statement_access()
+    def __getattribute__(self, attr):
+        """
+        intercept 'query_set' attr get
+        """
+        if attr == 'query_set':
+            self.__assert_false_statement_access()
 
-    def add_sub_op(self, op):
-        self.sub_op_set.append(op)
+        return object.__getattribute__(self, attr)
 
     def __iter__(self):
         for s_op in self.sub_op_set:
             for dbq in s_op:
                 yield dbq
 
+    def add_statement(self, query, query_params={}):
+        self.__assert_false_statement_access()
+
+    def add_sub_op(self, op):
+        self.sub_op_set.append(op)
+
     def iter__sub_op(self):
         for s_op in self.sub_op_set:
             yield s_op
 
-    def __getattribute__(self, attr):
         """
-        intercept 'query_set' attr get
         """
-        if attr == 'query_set':
-            self.__assert_false_statement_access()
-
-        return object.__getattribute__(self, attr)
 
     def process_result_set(self):
         ret = []