Author: astaric
Date: Mon Apr 29 08:57:19 2013
New Revision: 1476926
URL: http://svn.apache.org/r1476926
Log:
Python2.6 compatibility for bhsearch tests.
Modified:
bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py?rev=1476926&r1=1476925&r2=1476926&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py Mon Apr 29
08:57:19 2013
@@ -17,7 +17,12 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import unittest
+import sys
+if sys.version < (2, 7):
+ import unittest2 as unittest
+else:
+ import unittest
+
from bhsearch.tests import (whoosh_backend, index_with_whoosh, web_ui,
api, query_parser, query_suggestion, security)
from bhsearch.tests.search_resources import (ticket_search, wiki_search,
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py?rev=1476926&r1=1476925&r2=1476926&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py Mon Apr 29
08:57:19 2013
@@ -22,9 +22,14 @@ r"""
Test utils methods
"""
import contextlib
-import unittest
-import tempfile
import shutil
+import sys
+import tempfile
+if sys.version < (2, 7):
+ import unittest2 as unittest
+else:
+ import unittest
+
from bhsearch.web_ui import BloodhoundSearchModule
from trac.ticket import Ticket, Milestone
Modified:
bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py?rev=1476926&r1=1476925&r2=1476926&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py
(original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py
Mon Apr 29 08:57:19 2013
@@ -18,7 +18,12 @@
# specific language governing permissions and limitations
# under the License.
-import unittest
+import sys
+if sys.version < (2, 7):
+ import unittest2 as unittest
+else:
+ import unittest
+
from bhsearch.search_resources.base import SimpleSearchWikiSyntaxFormatter
from bhsearch.tests.base import BaseBloodhoundSearchTest
from trac.web import Href
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py?rev=1476926&r1=1476925&r2=1476926&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py Mon Apr 29
08:57:19 2013
@@ -17,7 +17,11 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import unittest
+import sys
+if sys.version < (2, 7):
+ import unittest2 as unittest
+else:
+ import unittest
from urllib import urlencode, unquote, unquote_plus
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py?rev=1476926&r1=1476925&r2=1476926&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py
(original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py Mon Apr
29 08:57:19 2013
@@ -19,9 +19,14 @@
# under the License.
from datetime import datetime
import os
-import unittest
-import tempfile
import shutil
+import sys
+import tempfile
+if sys.version < (2, 7):
+ import unittest2 as unittest
+else:
+ import unittest
+
from bhsearch.api import ASC, DESC, SCORE, SortInstruction
from bhsearch.query_parser import DefaultQueryParser
from bhsearch.tests.base import BaseBloodhoundSearchTest
