move lib/mako to mako

23 files changed, 3 insertions, 4 deletions

diff --git a/doc/build/genhtml.py b/doc/build/genhtml.py
index 5c8431c..b547dc6 100644
--- a/doc/build/genhtml.py
+++ b/doc/build/genhtml.py
@@ -2,7 +2,7 @@
 import sys,re,os,shutil
 import cPickle as pickle
 
-sys.path = ['../../lib', './lib/'] + sys.path
+sys.path = ['../../', './lib/'] + sys.path
 
 from mako.lookup import TemplateLookup
 from mako import exceptions, __version__ as version
diff --git a/lib/mako/__init__.py b/mako/__init__.py
index 6a30418..6a30418 100644
--- a/lib/mako/__init__.py
+++ b/mako/__init__.py
diff --git a/lib/mako/_ast_util.py b/mako/_ast_util.py
index 6ff4ab9..6ff4ab9 100644
--- a/lib/mako/_ast_util.py
+++ b/mako/_ast_util.py
diff --git a/lib/mako/ast.py b/mako/ast.py
index 3b9f3ed..3b9f3ed 100644
--- a/lib/mako/ast.py
+++ b/mako/ast.py
diff --git a/lib/mako/cache.py b/mako/cache.py
index 43f7317..43f7317 100644
--- a/lib/mako/cache.py
+++ b/mako/cache.py
diff --git a/lib/mako/codegen.py b/mako/codegen.py
index b3074f0..b3074f0 100644
--- a/lib/mako/codegen.py
+++ b/mako/codegen.py
diff --git a/lib/mako/exceptions.py b/mako/exceptions.py
index dcd6a64..dcd6a64 100644
--- a/lib/mako/exceptions.py
+++ b/mako/exceptions.py
diff --git a/lib/mako/ext/__init__.py b/mako/ext/__init__.py
index e69de29..e69de29 100644
--- a/lib/mako/ext/__init__.py
+++ b/mako/ext/__init__.py
diff --git a/lib/mako/ext/autohandler.py b/mako/ext/autohandler.py
index 3025f8e..3025f8e 100644
--- a/lib/mako/ext/autohandler.py
+++ b/mako/ext/autohandler.py
diff --git a/lib/mako/ext/babelplugin.py b/mako/ext/babelplugin.py
index 9f08c5e..9f08c5e 100644
--- a/lib/mako/ext/babelplugin.py
+++ b/mako/ext/babelplugin.py
diff --git a/lib/mako/ext/preprocessors.py b/mako/ext/preprocessors.py
index 601ac0d..601ac0d 100644
--- a/lib/mako/ext/preprocessors.py
+++ b/mako/ext/preprocessors.py
diff --git a/lib/mako/ext/pygmentplugin.py b/mako/ext/pygmentplugin.py
index 09ffe12..09ffe12 100644
--- a/lib/mako/ext/pygmentplugin.py
+++ b/mako/ext/pygmentplugin.py
diff --git a/lib/mako/ext/turbogears.py b/mako/ext/turbogears.py
index f82f907..f82f907 100644
--- a/lib/mako/ext/turbogears.py
+++ b/mako/ext/turbogears.py
diff --git a/lib/mako/filters.py b/mako/filters.py
index 9a5b21d..9a5b21d 100644
--- a/lib/mako/filters.py
+++ b/mako/filters.py
diff --git a/lib/mako/lexer.py b/mako/lexer.py
index 52a4b6d..52a4b6d 100644
--- a/lib/mako/lexer.py
+++ b/mako/lexer.py
diff --git a/lib/mako/lookup.py b/mako/lookup.py
index 0398c5e..0398c5e 100644
--- a/lib/mako/lookup.py
+++ b/mako/lookup.py
diff --git a/lib/mako/parsetree.py b/mako/parsetree.py
index 347c31a..347c31a 100644
--- a/lib/mako/parsetree.py
+++ b/mako/parsetree.py
diff --git a/lib/mako/pygen.py b/mako/pygen.py
index 914443b..914443b 100644
--- a/lib/mako/pygen.py
+++ b/mako/pygen.py
diff --git a/lib/mako/pyparser.py b/mako/pyparser.py
index c79692c..c79692c 100644
--- a/lib/mako/pyparser.py
+++ b/mako/pyparser.py
diff --git a/lib/mako/runtime.py b/mako/runtime.py
index a475b71..a475b71 100644
--- a/lib/mako/runtime.py
+++ b/mako/runtime.py
diff --git a/lib/mako/template.py b/mako/template.py
index 4bf01e0..4bf01e0 100644
--- a/lib/mako/template.py
+++ b/mako/template.py
diff --git a/lib/mako/util.py b/mako/util.py
index 1f9f3d4..1f9f3d4 100644
--- a/lib/mako/util.py
+++ b/mako/util.py
diff --git a/setup.py b/setup.py
index 1b1184d..fe03b70 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import os
 import re
 
-v = file(os.path.join(os.path.dirname(__file__), 'lib', 'mako', '__init__.py'))
+v = file(os.path.join(os.path.dirname(__file__), 'mako', '__init__.py'))
 VERSION = re.compile(r".*__version__ = '(.*?)'", re.S).match(v.read()).group(1)
 v.close()
 
@@ -36,8 +36,7 @@ SVN version:
       author_email='mike@zzzcomputing.com',
       url='http://www.makotemplates.org/',
       license='MIT',
-      package_dir={'':'lib'},
-      packages=find_packages('lib', exclude=['ez_setup', 'examples', 'tests']),
+      packages=find_packages('.', exclude=['ez_setup', 'examples', 'tests']),
       scripts=['scripts/mako-render'],
       zip_safe=False,
       install_requires=[