summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2008-01-28 21:51:25 (GMT)
committerRaymond Hettinger <python@rcn.com>2008-01-28 21:51:25 (GMT)
commitbf3d1d5dc8ef84c2ef43c7785d3caa2b82f32d20 (patch)
treef804cdfe0558f31a5310e4ab594df32e1f3b6a6b
parente84ada3d957defaf64a5af4bc359fe866d4b8664 (diff)
downloadcpython-bf3d1d5dc8ef84c2ef43c7785d3caa2b82f32d20.zip
cpython-bf3d1d5dc8ef84c2ef43c7785d3caa2b82f32d20.tar.gz
cpython-bf3d1d5dc8ef84c2ef43c7785d3caa2b82f32d20.tar.bz2
Removed unnecessary conditional (spotted by Neal Norwitz).
-rw-r--r--Python/marshal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/marshal.c b/Python/marshal.c
index 1b88ff9..facfa1c 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -882,7 +882,7 @@ r_object(RFILE *p)
break;
}
}
- retval = (v == NULL) ? NULL : v;
+ retval = v;
break;
case TYPE_CODE: