Merge lp:~pedronis/u1db/cleanups into lp:u1db

[Samuele Pedroni]

some fixes of problems and unused imports found with pyflakes,

some leftovers from the raw socket sync removal

=== modified file 'u1db/commandline/command.py'
--- u1db/commandline/command.py	2011-11-03 21:48:45 +0000
+++ u1db/commandline/command.py	2011-11-23 09:45:30 +0000
@@ -75,7 +75,7 @@
 
         Subclasses should implement this, requesting their specific arguments.
         """
-        raise NotImplementedError(run)
+        raise NotImplementedError(self.run)
 
 
 

=== modified file 'u1db/errors.py'
--- u1db/errors.py	2011-10-25 10:54:22 +0000
+++ u1db/errors.py	2011-11-23 09:45:30 +0000
@@ -14,6 +14,7 @@
 
 """A list of errors that u1db can raise."""
 
+
 class U1DBError(Exception):
     """Generic base class for U1DB errors."""
 
@@ -36,15 +37,3 @@
     Can also be raised if wildcard matches are not strictly at the tail of the
     request.
     """
-
-
-class BadProtocolStream(U1DBError):
-    """Raised when part of the protocol stream is incorrectly formatted."""
-
-
-class UnknownProtocolVersion(BadProtocolStream):
-    """Raised when the protocol header is unknown to us."""
-
-
-class UnknownRequest(BadProtocolStream):
-    """Raised when an RPC comes in for a request we don't know about."""

=== modified file 'u1db/tests/commandline/__init__.py'
--- u1db/tests/commandline/__init__.py	2011-10-31 22:06:36 +0000
+++ u1db/tests/commandline/__init__.py	2011-11-23 09:45:30 +0000
@@ -12,6 +12,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import errno
 import time
 
 

=== modified file 'u1db/tests/commandline/test_client.py'
--- u1db/tests/commandline/test_client.py	2011-11-21 14:31:33 +0000
+++ u1db/tests/commandline/test_client.py	2011-11-23 09:45:30 +0000
@@ -16,7 +16,6 @@
 import os
 import sys
 import subprocess
-import time
 
 from u1db import (
     __version__ as _u1db_version,

=== modified file 'u1db/tests/commandline/test_serve.py'
--- u1db/tests/commandline/test_serve.py	2011-11-21 14:24:59 +0000
+++ u1db/tests/commandline/test_serve.py	2011-11-23 09:45:30 +0000
@@ -12,7 +12,6 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import errno
 import os
 import socket
 import subprocess

=== modified file 'u1db/tests/test_http_client.py'
--- u1db/tests/test_http_client.py	2011-11-21 14:24:59 +0000
+++ u1db/tests/test_http_client.py	2011-11-23 09:45:30 +0000
@@ -14,8 +14,6 @@
 
 """Tests for HTTPDatabase"""
 
-import inspect
-import os
 import simplejson
 from wsgiref import simple_server
 

=== modified file 'u1db/tests/test_http_database.py'
--- u1db/tests/test_http_database.py	2011-11-18 15:27:06 +0000
+++ u1db/tests/test_http_database.py	2011-11-23 09:45:30 +0000
@@ -15,9 +15,6 @@
 """Tests for HTTPDatabase"""
 
 import inspect
-import os
-import simplejson
-from wsgiref import simple_server
 
 from u1db import (
     Document,

=== renamed file 'u1db/tests/test_remote_requests.py' => 'u1db/tests/test_server_state.py'
--- u1db/tests/test_remote_requests.py	2011-11-22 11:09:00 +0000
+++ u1db/tests/test_server_state.py	2011-11-23 09:45:30 +0000
@@ -12,7 +12,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Tests for the remote request objects"""
+"""Tests for server state object."""
 
 import os
 

=== modified file 'u1db/tests/test_sqlite_backend.py'
--- u1db/tests/test_sqlite_backend.py	2011-11-22 16:06:25 +0000
+++ u1db/tests/test_sqlite_backend.py	2011-11-23 09:45:30 +0000
@@ -21,7 +21,6 @@
 import shutil
 
 from sqlite3 import dbapi2
-import simplejson
 
 from u1db import (
     tests,