From 1f10ba1eff6339729a1c72267e2b1a8712a54c5f Mon Sep 17 00:00:00 2001 From: Mateusz Kwapich Date: Tue, 28 Jan 2020 14:57:59 -0800 Subject: [PATCH] copytrace: rename anydbm to dbm Summary: The module name was changed. Reviewed By: sfilipco, xavierd Differential Revision: D19609573 fbshipit-source-id: 7ac812c339b363dab52c942581ee10ca3e607061 --- eden/scm/edenscm/hgext/copytrace.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/eden/scm/edenscm/hgext/copytrace.py b/eden/scm/edenscm/hgext/copytrace.py index c186fd1377..55e220fba5 100644 --- a/eden/scm/edenscm/hgext/copytrace.py +++ b/eden/scm/edenscm/hgext/copytrace.py @@ -35,11 +35,10 @@ """ -# pyre-fixme[21]: Could not find `anydbm`. -import anydbm import collections import json import os +import sys import time from edenscm.mercurial import ( @@ -58,6 +57,12 @@ from edenscm.mercurial import ( from edenscm.mercurial.i18n import _ +if sys.version_info[0] < 3: + import anydbm as dbm +else: + import dbm + + try: # pyre-fixme[21]: Could not find `gdbm`. import gdbm @@ -169,10 +174,10 @@ def _runcommand(orig, lui, repo, cmd, fullargs, ui, *args, **kwargs): def opendbm(repo, flag): """Open the dbm of choice. - On some platforms, anydbm is available, on others it's not, + On some platforms, dbm is available, on others it's not, but gdbm is unfortunately not available everywhere, like on Windows. """ - dbms = [(anydbm.open, "amendcopytrace", anydbm.error)] + dbms = [(dbm.open, "amendcopytrace", dbm.error)] if hasgdbm: dbms.append((gdbm.open, "amendcopytrace.gdbm", gdbm.error))