fix: keep python2 working a little longer.

Author: rouilj

roundup/admin.py

@@ -34,6 +34,7 @@
 import roundup.instance
 from roundup import __version__ as roundup_version
 from roundup import date, hyperdb, init, password, token_r
+from roundup.anypy import scandir_
 from roundup.anypy.my_input import my_input
 from roundup.anypy.strings import repr_export
 from roundup.configuration import (

roundup/anypy/scandir_.py

@@ -0,0 +1,8 @@
+try:
+    # python 3.5+
+    from os import scandir
+except ImportError:
+    # python 2 fallback
+    import os
+    import scandir # pip package
+    os.scandir = scandir.scandir

roundup/backends/blobfiles.py

@@ -22,6 +22,7 @@
 
 import os
 
+from roundup.anypy import scandir_
 
 def files_in_dir(dir):
     if not os.path.exists(dir):

roundup/cgi/templating.py

@@ -27,6 +27,7 @@
 import textwrap
 
 from roundup import date, hyperdb, support
+from roundup.anypy import scandir_
 from roundup.anypy import urllib_
 from roundup.anypy.cgi_ import cgi
 from roundup.anypy.html import html_escape

roundup/init.py

@@ -26,6 +26,7 @@
 
 
 from roundup import install_util
+from roundup.anypy import scandir_
 from roundup.configuration import CoreConfig
 from roundup.i18n import _
 

roundup/instance.py

@@ -43,6 +43,7 @@
 
 from roundup import configuration, mailgw
 from roundup import hyperdb, backends, actions
+from roundup.anypy import scandir_
 from roundup.cgi import client, templating
 from roundup.cgi import actions as cgi_actions
 from roundup.exceptions import RoundupException

roundup/pygettext.py

@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+# -*- coding: utf-8 -*-
 # Originally written by Barry Warsaw <[email protected]>
 #
 # Minimally patched to make it even more xgettext compatible

roundup/scripts/roundup_gettext.py

@@ -21,7 +21,7 @@
     sys.path.insert(0, rootdir)
 # --/
 
-
+from roundup.anypy import scandir_
 from roundup import configuration
 from roundup.cgi.TAL import talgettext
 from roundup.i18n import _