From e529a662500e9c4d7d55d80c887a8b2437d838cb Mon Sep 17 00:00:00 2001
From: iElectric <unknown>
Date: Fri, 7 Aug 2009 16:10:15 +0200
Subject: [PATCH] remove versioning.base in favor of versioning.config

---
 migrate/versioning/base/__init__.py             |  5 -----
 migrate/versioning/cfgparse.py                  |  2 +-
 migrate/versioning/{base/const.py => config.py} |  3 +++
 migrate/versioning/pathed.py                    |  7 +++++--
 migrate/versioning/repository.py                |  9 ++++++---
 migrate/versioning/script/base.py               | 10 +++++++---
 migrate/versioning/script/py.py                 |  2 +-
 migrate/versioning/shell.py                     |  2 +-
 migrate/versioning/template.py                  |  2 +-
 9 files changed, 25 insertions(+), 17 deletions(-)
 delete mode 100644 migrate/versioning/base/__init__.py
 rename migrate/versioning/{base/const.py => config.py} (87%)

diff --git a/migrate/versioning/base/__init__.py b/migrate/versioning/base/__init__.py
deleted file mode 100644
index 4c3842a..0000000
--- a/migrate/versioning/base/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""Things that should be imported by all migrate packages"""
-
-#__all__ = ['logging','log','databases','operations']
-from logger import logging, log
-from const import databases, operations
diff --git a/migrate/versioning/cfgparse.py b/migrate/versioning/cfgparse.py
index b2660bd..ff27d67 100644
--- a/migrate/versioning/cfgparse.py
+++ b/migrate/versioning/cfgparse.py
@@ -4,7 +4,7 @@
 
 from ConfigParser import ConfigParser
 
-from migrate.versioning.base import *
+from migrate.versioning.config import *
 from migrate.versioning import pathed
 
 
diff --git a/migrate/versioning/base/const.py b/migrate/versioning/config.py
similarity index 87%
rename from migrate/versioning/base/const.py
rename to migrate/versioning/config.py
index 7c24245..2429fd8 100644
--- a/migrate/versioning/base/const.py
+++ b/migrate/versioning/config.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
 from sqlalchemy.util import OrderedDict
 
 
diff --git a/migrate/versioning/pathed.py b/migrate/versioning/pathed.py
index 6174737..cce333c 100644
--- a/migrate/versioning/pathed.py
+++ b/migrate/versioning/pathed.py
@@ -4,11 +4,14 @@
 
 import os
 import shutil
+import logging
 
 from migrate.versioning import exceptions
-from migrate.versioning.base import *
+from migrate.versioning.config import *
 from migrate.versioning.util import KeyedInstance
 
+log = logging.getLogger(__name__)
+
 
 class Pathed(KeyedInstance):
     """
@@ -32,7 +35,7 @@ class Pathed(KeyedInstance):
         """Try to initialize this object's parent, if it has one"""
         parent_path = self.__class__._parent_path(path)
         self.parent = self.__class__.parent(parent_path)
-        log.info("Getting parent %r:%r" % (self.__class__.parent, parent_path))
+        log.debug("Getting parent %r:%r" % (self.__class__.parent, parent_path))
         self.parent._init_child(path, self)
 
     def _init_child(self, child, path):
diff --git a/migrate/versioning/repository.py b/migrate/versioning/repository.py
index 55768ef..34af983 100644
--- a/migrate/versioning/repository.py
+++ b/migrate/versioning/repository.py
@@ -4,15 +4,18 @@
 import os
 import shutil
 import string
+import logging
 from pkg_resources import resource_filename
 
 from tempita import Template as TempitaTemplate
 
 from migrate.versioning import exceptions, script, version, pathed, cfgparse
 from migrate.versioning.template import Template
-from migrate.versioning.base import *
+from migrate.versioning.config import *
 
 
+log = logging.getLogger(__name__)
+
 class Changeset(dict):
     """A collection of changes to be applied to a database.
 
@@ -69,13 +72,13 @@ class Repository(pathed.Pathed):
     _versions = 'versions'
 
     def __init__(self, path):
-        log.info('Loading repository %s...' % path)
+        log.debug('Loading repository %s...' % path)
         self.verify(path)
         super(Repository, self).__init__(path)
         self.config = cfgparse.Config(os.path.join(self.path, self._config))
         self.versions = version.Collection(os.path.join(self.path,
                                                       self._versions))
-        log.info('Repository %s loaded successfully' % path)
+        log.debug('Repository %s loaded successfully' % path)
         log.debug('Config: %r' % self.config.to_dict())
 
     @classmethod
diff --git a/migrate/versioning/script/base.py b/migrate/versioning/script/base.py
index 2fdc5df..1c6cca9 100644
--- a/migrate/versioning/script/base.py
+++ b/migrate/versioning/script/base.py
@@ -1,9 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from migrate.versioning.base import log, operations
+import logging
+
+from migrate.versioning.config import operations
 from migrate.versioning import pathed, exceptions
 
+log = logging.getLogger(__name__)
+
 
 class BaseScript(pathed.Pathed):
     """Base class for other types of scripts.
@@ -20,10 +24,10 @@ class BaseScript(pathed.Pathed):
     """ # TODO: sphinxfy this and implement it correctly
 
     def __init__(self, path):
-        log.info('Loading script %s...' % path)
+        log.debug('Loading script %s...' % path)
         self.verify(path)
         super(BaseScript, self).__init__(path)
-        log.info('Script %s loaded successfully' % path)
+        log.debug('Script %s loaded successfully' % path)
     
     @classmethod
     def verify(cls, path):
diff --git a/migrate/versioning/script/py.py b/migrate/versioning/script/py.py
index b8f29a1..9f5d514 100644
--- a/migrate/versioning/script/py.py
+++ b/migrate/versioning/script/py.py
@@ -6,7 +6,7 @@ from StringIO import StringIO
 
 import migrate
 from migrate.versioning import exceptions, genmodel, schemadiff
-from migrate.versioning.base import operations
+from migrate.versioning.config import operations
 from migrate.versioning.template import Template
 from migrate.versioning.script import base
 from migrate.versioning.util import import_path, load_model, construct_engine
diff --git a/migrate/versioning/shell.py b/migrate/versioning/shell.py
index 78e0e5d..16c0d73 100644
--- a/migrate/versioning/shell.py
+++ b/migrate/versioning/shell.py
@@ -7,7 +7,7 @@ import sys
 import inspect
 from optparse import OptionParser, BadOptionError
 
-from migrate.versioning.base import *
+from migrate.versioning.config import *
 from migrate.versioning import api, exceptions
 
 
diff --git a/migrate/versioning/template.py b/migrate/versioning/template.py
index aa1cc34..1440fc1 100644
--- a/migrate/versioning/template.py
+++ b/migrate/versioning/template.py
@@ -7,7 +7,7 @@ import sys
 
 from pkg_resources import resource_filename
 
-from migrate.versioning.base import *
+from migrate.versioning.config import *
 from migrate.versioning import pathed