summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2009-09-10 10:36:47 +0000
committerMarko Kreen2009-09-10 11:54:14 +0000
commitf0fab5d93e7ec3e12b47a6c25b03a805f1a80514 (patch)
treeb1176ed491402ee9554a194d6a508e66a854d9ae
parent8ee1c37f7c528a70a2b4bce509829621dba0b9b8 (diff)
python/: clean up imports
- Remove unused imports - Remove relative imports
-rw-r--r--python/londiste/compare.py2
-rw-r--r--python/londiste/repair.py4
-rw-r--r--python/londiste/table_copy.py2
-rw-r--r--python/pgq/cascade/consumer.py2
-rw-r--r--python/pgq/cascade/worker.py2
-rw-r--r--python/pgq/remoteconsumer.py2
-rw-r--r--python/pgq/status.py2
-rw-r--r--python/pgq/ticker.py4
-rw-r--r--python/skytools/adminscript.py2
-rw-r--r--python/skytools/skylog.py2
10 files changed, 12 insertions, 12 deletions
diff --git a/python/londiste/compare.py b/python/londiste/compare.py
index 3369f3a1..23324cf0 100644
--- a/python/londiste/compare.py
+++ b/python/londiste/compare.py
@@ -5,7 +5,7 @@
Currently just does count(1) on both sides.
"""
-import sys, os, time, skytools
+import sys, skytools
__all__ = ['Comparator']
diff --git a/python/londiste/repair.py b/python/londiste/repair.py
index 2f50ee50..dd0081ab 100644
--- a/python/londiste/repair.py
+++ b/python/londiste/repair.py
@@ -5,9 +5,9 @@ Walks tables by primary key and searcher
missing inserts/updates/deletes.
"""
-import sys, os, time, skytools
+import sys, os, skytools
-from syncer import Syncer
+from londiste.syncer import Syncer
__all__ = ['Repairer']
diff --git a/python/londiste/table_copy.py b/python/londiste/table_copy.py
index 75d92f56..afeb5886 100644
--- a/python/londiste/table_copy.py
+++ b/python/londiste/table_copy.py
@@ -5,7 +5,7 @@
For internal usage.
"""
-import sys, os, time, skytools
+import sys, time, skytools
from skytools.dbstruct import *
from londiste.playback import *
diff --git a/python/pgq/cascade/consumer.py b/python/pgq/cascade/consumer.py
index 8676e5bd..7670accc 100644
--- a/python/pgq/cascade/consumer.py
+++ b/python/pgq/cascade/consumer.py
@@ -4,7 +4,7 @@
Does not maintain node, but is able to pause, resume and switch provider.
"""
-import sys, time, skytools
+import sys, time
from pgq.consumer import Consumer
diff --git a/python/pgq/cascade/worker.py b/python/pgq/cascade/worker.py
index c697156a..babf7c6e 100644
--- a/python/pgq/cascade/worker.py
+++ b/python/pgq/cascade/worker.py
@@ -4,7 +4,7 @@ CascadedConsumer that also maintains node.
"""
-import sys, time, skytools
+import time
from pgq.cascade.consumer import CascadedConsumer
from pgq.producer import bulk_insert_events
diff --git a/python/pgq/remoteconsumer.py b/python/pgq/remoteconsumer.py
index cc8b73d9..fe8ebdd6 100644
--- a/python/pgq/remoteconsumer.py
+++ b/python/pgq/remoteconsumer.py
@@ -4,7 +4,7 @@ old RemoteConsumer / SerialConsumer classes.
"""
-import sys, time, skytools
+import sys
from pgq.consumer import Consumer
diff --git a/python/pgq/status.py b/python/pgq/status.py
index d3f285c0..7a434e3e 100644
--- a/python/pgq/status.py
+++ b/python/pgq/status.py
@@ -2,7 +2,7 @@
"""Status display.
"""
-import sys, os, skytools
+import sys, skytools
__all__ = ['PGQStatus']
diff --git a/python/pgq/ticker.py b/python/pgq/ticker.py
index ba8aadb2..e623b9cb 100644
--- a/python/pgq/ticker.py
+++ b/python/pgq/ticker.py
@@ -3,10 +3,10 @@
It will also launch maintenance job.
"""
-import sys, os, time, threading
+import time, threading
import skytools
-from maint import MaintenanceJob
+from pgq.maint import MaintenanceJob
__all__ = ['SmallTicker']
diff --git a/python/skytools/adminscript.py b/python/skytools/adminscript.py
index f40c6ec5..713e1843 100644
--- a/python/skytools/adminscript.py
+++ b/python/skytools/adminscript.py
@@ -3,7 +3,7 @@
"""Admin scripting.
"""
-import sys, os, inspect
+import sys, inspect
from skytools.scripting import DBScript
from skytools.quoting import quote_statement
diff --git a/python/skytools/skylog.py b/python/skytools/skylog.py
index 08b00bed..7f35658f 100644
--- a/python/skytools/skylog.py
+++ b/python/skytools/skylog.py
@@ -1,7 +1,7 @@
"""Our log handlers for Python's logging package.
"""
-import sys, os, time, socket
+import os, time, socket
import logging, logging.handlers
from skytools.psycopgwrapper import connect_database