summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-02-20 22:51:50 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-02-20 22:51:50 (GMT)
commit9edceb3e591063f382ae82e14313813ffc1af0bf (patch)
tree6461f95d7aa4c4077712fc0095eb6be0fd198c27
parente9f637b062b3d23f284a88c45b3a8889eca673ca (diff)
parent2697cd1a3b08ae07c4002f9d71f89e8966705f5b (diff)
downloadcpython-9edceb3e591063f382ae82e14313813ffc1af0bf.zip
cpython-9edceb3e591063f382ae82e14313813ffc1af0bf.tar.gz
cpython-9edceb3e591063f382ae82e14313813ffc1af0bf.tar.bz2
Merge
-rw-r--r--Python/random.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/random.c b/Python/random.c
index 327166e..01cd83a 100644
--- a/Python/random.c
+++ b/Python/random.c
@@ -269,7 +269,7 @@ _PyRandom_Init(void)
*/
env = Py_GETENV("PYTHONHASHSEED");
- if (env && *env != '\0' & strcmp(env, "random") != 0) {
+ if (env && *env != '\0' && strcmp(env, "random") != 0) {
char *endptr = env;
unsigned long seed;
seed = strtoul(env, &endptr, 10);