- re-fixed the fix to the prefixes fix

- removed ancient descriptor() functions from dialects; replaced with Dialect.name
- removed similarly ancient sys.modules silliness in Engine.name

1 files changed, 1 insertions, 9 deletions

diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 00c3c1e01..815024a00 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -188,15 +188,6 @@ ischema_names = {
     'LONG' : OracleText,
 }
 
-def descriptor():
-    return {'name':'oracle',
-    'description':'Oracle',
-    'arguments':[
-        ('dsn', 'Data Source Name', None),
-        ('user', 'Username', None),
-        ('password', 'Password', None)
-    ]}
-
 class OracleExecutionContext(default.DefaultExecutionContext):
     def pre_exec(self):
         super(OracleExecutionContext, self).pre_exec()
@@ -240,6 +231,7 @@ class OracleExecutionContext(default.DefaultExecutionContext):
         return base.ResultProxy(self)
 
 class OracleDialect(default.DefaultDialect):
+    name = 'oracle'
     supports_alter = True
     supports_unicode_statements = False
     max_identifier_length = 30