Merge pull request pvieito#51 from philipturner/patch-8

Add further support for count computed property

Author: pvieito

PythonKit/Python.swift

@@ -394,6 +394,10 @@ public struct ThrowingPythonObject {
         }
         return (elt0, elt1, elt2, elt3)
     }
+    
+    public var count: Int? {
+        base.checking.count
+    }
 }
 
 
@@ -507,6 +511,10 @@ public struct CheckingPythonObject {
         }
         return (elt0, elt1, elt2, elt3)
     }
+    
+    public var count: Int? {
+        Int(Python.len(base))
+    }
 }
 
 //===----------------------------------------------------------------------===//
@@ -1402,7 +1410,7 @@ extension PythonObject : Sequence {
 
 extension PythonObject {
     public var count: Int { 
-        Int(Python.len(self))!
+        checking.count!
     }
 }
 

Tests/PythonKitTests/PythonRuntimeTests.swift

@@ -20,6 +20,10 @@ class PythonRuntimeTests: XCTestCase {
         XCTAssertEqual(1.5, polymorphicList[3])
         XCTAssertEqual(1.5, polymorphicList[-1])
 
+        XCTAssertEqual(4, polymorphicList.count as Int)
+        XCTAssertEqual(4, polymorphicList.checking.count!)
+        XCTAssertEqual(4, polymorphicList.throwing.count!)
+        
         polymorphicList[2] = 2
         XCTAssertEqual(2, polymorphicList[2])
     }
@@ -30,6 +34,10 @@ class PythonRuntimeTests: XCTestCase {
         XCTAssertEqual(2, Python.len(dict))
         XCTAssertEqual(1, dict["a"])
         XCTAssertEqual(0.5, dict[1])
+      
+        XCTAssertEqual(2, dict.count as Int)
+        XCTAssertEqual(2, dict.checking.count!)
+        XCTAssertEqual(2, dict.throwing.count!)
 
         dict["b"] = "c"
         XCTAssertEqual("c", dict["b"])