Adding back Python 2.6.

ubuntu-repo · Mar 14, 2013 · a238ac5 · a238ac5
1 parent 1241707
commit a238ac5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ python:
   - "2.7"
   - "3.2"
   - "3.3"
-#  - "2.6"  # XXX: Importlib dep?
+  - "2.6"
 # command to install dependencies
 install: "pip install -r requirements.txt --use-mirrors"
 # # command to run tests

diff --git a/hy/core/__init__.py b/hy/core/__init__.py
@@ -20,8 +20,6 @@
 
 from hy.macros import process as mprocess
 
-import importlib
-
 
 MACROS = [
     "hy.core.bootstrap",  # defn, cond
@@ -35,4 +33,4 @@ def process(tree):
 
 def load_macros():
     for module in MACROS:
-        importlib.import_module(module)
+        __import__(module)
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-# importlib  # python 2.6
+# Nothing, yet! (ish). Check site / dev for more deps!
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,pypy,py32,py33
+envlist = py27,pypy,py32,py33,py26
 [testenv]
 commands = nosetests
 deps =
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		# importlib # python 2.6
		# Nothing, yet! (ish). Check site / dev for more deps!