--- a/mercurial/hgweb.py
+++ b/mercurial/hgweb.py
@@ -6,9 +6,10 @@
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
-import os, cgi, time, re, difflib, socket, sys, zlib
-from mercurial.hg import *
-from mercurial.ui import *
+import os, cgi, time, re, socket, sys, zlib
+from hg import *
+from ui import *
+
def templatepath():
for f in "templates", "../templates":
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -11,7 +11,7 @@ of the GNU General Public License, incor
"""
import zlib, struct, sha, binascii, heapq
-from mercurial import mdiff
+import mdiff
from node import *
def hash(text, p1, p2):