Changeset 1330

Timestamp:

07/24/09 09:30:49 (12 months ago)

Author:

hobu

Message:

clean up Rtree and Index constructors

Files:

• Rtree/trunk/rtree/index.py (modified) (2 diffs)

Rtree/trunk/rtree/index.py

@@ -20 +20 @@
 
 class Index(object):
-    def __init__(self,  filename=None, 
-                        properties=None, 
-                        owned = True, 
-                        pagesize = None):
-        if properties:
-            self.properties = properties
+    def __init__(self,  *args, **kwargs):
+
+        try:
+            self.properties = kwargs['properties']
+        except KeyError:
+            self.properties = Property()
+            
+        if args:
+            basename = args[0]
         else:
-            self.properties = Property()
-            
-        if filename:
-            self.properties.filename = filename
+            basename = None
+            
+        if basename:
+            self.properties.storage = RT_Disk
+            self.properties.filename = basename
+            
+            # check we can read the file
+            p = os.path.abspath(basename)
+            d = os.path.dirname(p)
+            if not os.access(d, os.W_OK):
+                message = "Unable to open file '%s' for index storage"%basename
+                raise IOError(message)
         else:
             self.properties.storage = RT_Memory
-        if pagesize:
-            self.properties.pagesize = pagesize
+            
+        if basename:
+            self.properties.filename = basename
+        else:
+            self.properties.storage = RT_Memory
+
+        try:
+            self.properties.pagesize = int(kwargs['pagesize'])
+        except KeyError:
+            pass
+            
+        try:
+            self.properties.overwrite = bool(kwargs['overwrite'])
+        except KeyError:
+            pass
         
         self.handle = core.rt.Index_Create(self.properties.handle)
@@ -268 +292 @@
     def __init__(self, *args, **kwargs):
         
-        if args:
-            basename = args[0]
-        else:
-            basename = None
-            
-        self.properties = Property()
-        
-        if basename:
-            self.properties.storage = RT_Disk
-            self.properties.filename = basename
-            
-            # check we can read the file
-            p = os.path.abspath(basename)
-            d = os.path.dirname(p)
-            if not os.access(d, os.W_OK):
-                message = "Unable to open file '%s' for index storage"%basename
-                raise IOError(message)
-            
-        else:
-            self.properties.storage = RT_Memory
-        
-        try:
-            self.properties.pagesize = int(kwargs['pagesize'])
-        except KeyError:
-            pass
-            
-        try:
-            self.properties.overwrite = bool(kwargs['overwrite'])
-        except KeyError:
-            pass
-        
-        
-        self.handle = core.rt.Index_Create(self.properties.handle)
-        self.owned = True
+        super(Rtree, self).__init__(*args, **kwargs)
+
 
 class Item(object):