Use nanosecond precision in cache for category directory mtimes

and cache for cp_list results when using Python >=3.3.

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 08580e8078e887c275d11eff4c505543f766e919..5008a97fb85f7027801d94e08e1f1bfac126d841 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -376,7 +376,10 @@ class vardbapi(dbapi):
                if mysplit[0] == '*':
                        mysplit[0] = mysplit[0][1:]
                try:
-                       mystat = os.stat(self.getpath(mysplit[0])).st_mtime
+                       if sys.hexversion >= 0x3030000:
+                               mystat = os.stat(self.getpath(mysplit[0])).st_mtime_ns
+                       else:
+                               mystat = os.stat(self.getpath(mysplit[0])).st_mtime
                except OSError:
                        mystat = 0
                if use_cache and mycp in self.cpcache:
@@ -511,7 +514,10 @@ class vardbapi(dbapi):
                        return list(self._iter_match(mydep,
                                self.cp_list(mydep.cp, use_cache=use_cache)))
                try:
-                       curmtime = os.stat(os.path.join(self._eroot, VDB_PATH, mycat)).st_mtime
+                       if sys.hexversion >= 0x3030000:
+                               curmtime = os.stat(os.path.join(self._eroot, VDB_PATH, mycat)).st_mtime_ns
+                       else:
+                               curmtime = os.stat(os.path.join(self._eroot, VDB_PATH, mycat)).st_mtime
                except (IOError, OSError):
                        curmtime=0