Horst Gutmann committed b29980f

Moved encoding import into the actual 1.2.1 fallback

  • Participants
  • Parent commits 8963447

Comments (0)

Files changed (1)

 # of the GNU General Public License, incorporated herein by reference.
 from mercurial.i18n import _
-from mercurial import hg, encoding, store, util
+from mercurial import hg, store, util
 from mercurial.node import *
 import os, shutil
 # 1.2.1 fallback
+    from mercurial import encoding
 except ImportError:
     encoding = util