Mercurial > wikked

diff tests/__init__.py @ 336:03e3e793fa22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert project to Python 3.4.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 19 Apr 2015 20:58:14 -0700
parents ebb12ff21cb2
children 666a9d0981bb
line wrap: on
line diff
--- a/tests/__init__.py	Sun Apr 19 20:54:10 2015 -0700
+++ b/tests/__init__.py	Sun Apr 19 20:58:14 2015 -0700
@@ -1,11 +1,11 @@
 import os
 import os.path
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import shutil
 import unittest
 from wikked.wiki import Wiki
 from wikked.db.sql import SQLDatabase
-from mock import MockWikiParameters, MockFileSystem
+from .mock import MockWikiParameters, MockFileSystem
 
 
 class MockWikiParametersWithStructure(MockWikiParameters):
@@ -26,7 +26,7 @@
 
     def tearDown(self):
         if hasattr(self, 'wiki') and self.wiki is not None:
-            self.wiki.db.close(False, None)
+            self.wiki.db.close(None)
 
         if os.path.isdir(self.test_data_dir):
             shutil.rmtree(self.test_data_dir)
@@ -68,7 +68,7 @@
     res = '<a class=\"wiki-link'
     if missing:
         res += ' missing'
-    url = urllib.quote(url)
+    url = urllib.parse.quote(url)
     res += '\" data-wiki-url=\"' + url + '\"'
     if mod:
         res += ' data-wiki-mod=\"' + mod + '\"'