dropbox
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 0 deletions b/‎.gitignore‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Makefile.am‎
Lines changed: 2 additions & 2 deletions b/‎Makefile.am‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎configure.ac‎
Lines changed: 23 additions & 1 deletion b/‎configure.ac‎
Lines changed: 23 additions & 1 deletion
diff --git a/‎docgen.py‎
Lines changed: 4 additions & 4 deletions b/‎docgen.py‎
Lines changed: 4 additions & 4 deletions
@@ -29,3 +29,5 @@ src/libnautilus_dropbox_la*
 rpmbuild/
 mockout/
 nautilus-dropbox-*.tar.bz2
+.mypy_cache/
+.vscode/
@@ -6,11 +6,11 @@ EXTRA_DIST = dropbox.in serializeimages.py dropbox.txt.in docgen.py rst2man.py
 man_MANS = dropbox.1
 
 dropbox: dropbox.in serializeimages.py
-	python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
+	python3 serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
 	chmod +x dropbox
 
 dropbox.1: dropbox.txt.in dropbox docgen.py
-	python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
+	python3 docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
 	$(RST2MAN) dropbox.txt > dropbox.1
 
 SUBDIRS = data src
@@ -30,6 +30,7 @@ PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 
 AC_PATH_PROG([PYTHON], [python])
+AC_PATH_PROG([PYTHON3], [python3])
 
 AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
 AC_SUBST(RST2MAN)
@@ -55,9 +56,30 @@ else
 fi
 ])
 
-PYTHON_CHECK_MODULE(gi, gi)
+AC_DEFUN([PYTHON3_CHECK_MODULE], [
+AC_MSG_CHECKING([for $1 on python3])
+
+cat <<EOF | python3
+try:
+ import $2
+except:
+ exit(1)
+else:
+ exit(0)
+EOF
+
+if test $? -ne 0; then
+   AC_MSG_RESULT([no])
+   AC_MSG_ERROR([couldn't find $1])
+else
+   AC_MSG_RESULT([yes])
+fi
+])
+
 PYTHON_CHECK_MODULE(docutils, docutils)
 
+PYTHON3_CHECK_MODULE(gi, gi)
+
 # Make dependency CFLAGS and LIBS available
 AC_SUBST(NAUTILUS_CFLAGS)
 AC_SUBST(NAUTILUS_LIBS)
 
@@ -5,7 +5,7 @@
 
 # heeeheee
 env = {"__name__":"__notmain__"}
-execfile("dropbox", env)
+exec(open("dropbox").read(), env)
 commands = env["commands"]
 
 f = open("AUTHORS", "r")
@@ -15,14 +15,14 @@
 formatted_commands = ""
 for cmd in commands:
     split = commands[cmd].__doc__.split('\n', 2)
-    formatted_commands += split[1].decode('ascii').replace(cmd, "`%s`" % cmd).replace("dropbox", "``dropbox``")
-    formatted_commands += split[2].decode('ascii').replace('\n', '\n  | ')
+    formatted_commands += split[1].replace(cmd, "`%s`" % cmd).replace("dropbox", "``dropbox``")
+    formatted_commands += split[2].replace('\n', '\n  | ')
     formatted_commands += '\n\n'
 
 date = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))).date()
 sys.stdout.write(sys.stdin.read().replace\
                      ('@AUTHORS@', authors).replace\
                      ('@DATE@', date.isoformat()).replace\
                      ('@PACKAGE_VERSION@', sys.argv[1]).replace\
-                     ('@SYNOPSIS@', '| '+'\n| '.join(commands[cmd].__doc__.split('\n', 2)[1].decode('ascii').replace(cmd, "`%s`" % cmd).replace("dropbox", "``dropbox``") for cmd in commands)).replace\
+                     ('@SYNOPSIS@', '| '+'\n| '.join(commands[cmd].__doc__.split('\n', 2)[1].replace(cmd, "`%s`" % cmd).replace("dropbox", "``dropbox``") for cmd in commands)).replace\
                      ('@COMMANDS@', formatted_commands))