Make Python statements compatible with version 2 and 3.

monnerat · vkareh · commit 855e61271bb3 · 2019-01-30T15:59:28.000-05:00
diff --git a/docs/Makefile.am b/docs/Makefile.am
@@ -86,7 +86,7 @@ BUILT_SOURCES = 		\
 	$(HTML_FILES)
 
 reference/builddate.xml: $(REFERENCE_DEPS)
-	$(PYTHON) -c 'import datetime; print datetime.date.today()' > $@
+	$(PYTHON) -c 'import datetime; print (datetime.date.today())' > $@
 
 $(HTML_FILES): $(REFERENCE_DEPS)
 	xsltproc --nonet --xinclude -o $(BUILDDIR)/html/ \
diff --git a/src/caja-python.c b/src/caja-python.c
@@ -196,7 +196,7 @@ caja_python_init_python (void)
 	}
 
 	debug("Sanitize the python search path");
-	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
+	PyRun_SimpleString("import sys; sys.path = list(filter(None, sys.path))");
 	if (PyErr_Occurred())
 	{
 		PyErr_Print();

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ caja_python_init_python (void)`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`debug("Sanitize the python search path");`
`199`		`- PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");`
	`199`	`+ PyRun_SimpleString("import sys; sys.path = list(filter(None, sys.path))");`
`200`	`200`	`if (PyErr_Occurred())`
`201`	`201`	`{`
`202`	`202`	`PyErr_Print();`