fixed a tiny corner case

Philip Guo · Philip Guo · commit 167e51e2c46d · 2012-10-02T14:49:22.000-07:00
diff --git a/v3/pg_encoder.py b/v3/pg_encoder.py
@@ -219,7 +219,16 @@ def encode(self, dat):
   def encode_class_or_instance(self, dat, new_obj):
     """Encode dat as a class or instance."""
     if is_instance(dat):
-      class_name = get_name(dat.__class__)
+      if hasattr(dat, '__class__'):
+        # common case ...
+        class_name = get_name(dat.__class__)
+      else:
+        # super special case for something like
+        # "from datetime import datetime_CAPI" in Python 3.2,
+        # which is some weird 'PyCapsule' type ...
+        # http://docs.python.org/release/3.1.5/c-api/capsule.html
+        class_name = get_name(type(dat))
+
       new_obj.extend(['INSTANCE', class_name])
       # don't traverse inside modules, or else risk EXPLODING the visualization
       if class_name == 'module':
diff --git a/v3/tests/backend-tests/cmodule.golden b/v3/tests/backend-tests/cmodule.golden
@@ -0,0 +1,37 @@
+{
+  "code": "# importing some C-ish module ...\n# make sure this doesn't crash in Python 2 or 3\nfrom datetime import datetime_CAPI\n", 
+  "trace": [
+    {
+      "ordered_globals": [], 
+      "stdout": "", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {}, 
+      "heap": {}, 
+      "line": 3, 
+      "event": "step_line"
+    }, 
+    {
+      "ordered_globals": [
+        "datetime_CAPI"
+      ], 
+      "stdout": "", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {
+        "datetime_CAPI": [
+          "REF", 
+          1
+        ]
+      }, 
+      "heap": {
+        "1": [
+          "PyCapsule", 
+          "<capsule object \"datetime.datetime_CAPI\" at 0xADDR>"
+        ]
+      }, 
+      "line": 3, 
+      "event": "return"
+    }
+  ]
+}
diff --git a/v3/tests/backend-tests/cmodule.golden_py3 b/v3/tests/backend-tests/cmodule.golden_py3
@@ -0,0 +1,37 @@
+{
+  "code": "# importing some C-ish module ...\n# make sure this doesn't crash in Python 2 or 3\nfrom datetime import datetime_CAPI\n", 
+  "trace": [
+    {
+      "ordered_globals": [], 
+      "stdout": "", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {}, 
+      "heap": {}, 
+      "line": 3, 
+      "event": "step_line"
+    }, 
+    {
+      "ordered_globals": [
+        "datetime_CAPI"
+      ], 
+      "stdout": "", 
+      "func_name": "<module>", 
+      "stack_to_render": [], 
+      "globals": {
+        "datetime_CAPI": [
+          "REF", 
+          1
+        ]
+      }, 
+      "heap": {
+        "1": [
+          "INSTANCE", 
+          "PyCapsule"
+        ]
+      }, 
+      "line": 3, 
+      "event": "return"
+    }
+  ]
+}
diff --git a/v3/tests/backend-tests/cmodule.txt b/v3/tests/backend-tests/cmodule.txt
@@ -0,0 +1,3 @@
+# importing some C-ish module ...
+# make sure this doesn't crash in Python 2 or 3
+from datetime import datetime_CAPI

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# importing some C-ish module ...`
	`2`	`+# make sure this doesn't crash in Python 2 or 3`
	`3`	`+from datetime import datetime_CAPI`