diff -r 27253368f045 -r 93325a5d61f0 src/ldt/ldt/text/tests/oauth_tests.py
--- a/src/ldt/ldt/text/tests/oauth_tests.py	Mon Apr 18 18:34:49 2011 +0200
+++ b/src/ldt/ldt/text/tests/oauth_tests.py	Wed Apr 20 00:55:58 2011 +0200
@@ -2,20 +2,13 @@
 
 """ Run these tests with 'python manage.py test text'  """
 
-from django.conf import settings, settings
-from django.contrib.auth.models import *
-from django.db import transaction
-from django.test import TestCase
-from ldt.test.client import Client
-from ldt.test.testcases import *
+from ldt.test.testcases import TestCase
 from ldt.text import VERSION_STR
-from ldt.text.models import Annotation
-from ldt.text.views import *
-from oauth2 import Request, SignatureMethod_HMAC_SHA1, SignatureMethod_PLAINTEXT, \
-    generate_nonce
+from oauth2 import Request, SignatureMethod_HMAC_SHA1, generate_nonce
 from oauth_provider.consts import OUT_OF_BAND
-from oauth_provider.models import Resource, Consumer, Token, Nonce
-import logging
+from oauth_provider.models import Consumer, Token
+import datetime
+import lxml
 import time
 import urlparse
 
@@ -62,7 +55,7 @@
         self.parameters_request['scope'] = 'delete'
         
         response = self.client.get("http://127.0.0.1:8000/oauth/request_token/", self.parameters_request)
-        self.assertEqual(response.status_code,200)
+        self.assertEqual(response.status_code, 200)
            
         token = list(Token.objects.all())[-1]
         data = urlparse.parse_qs(response.content)
@@ -78,19 +71,19 @@
         }
         
         response = self.client.get("/oauth/authorize/", parameters)
-        self.assertEqual(response.status_code,302)
+        self.assertEqual(response.status_code, 302)
         self.assertTrue(token.key in response['Location'])
         
         self.client.login(username='jane', password='toto')
         
         response = self.client.get("/oauth/authorize/", parameters)
-        self.assertEqual(response.status_code,200)
-        self.assertEqual(response.content,'Fake authorize view for example.com.')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, 'Fake authorize view for example.com.')
     
         # fake authorization by the user
         parameters['authorize_access'] = 1
         response = self.client.post("/oauth/authorize/", parameters)
-        self.assertEqual(response.status_code,200)
+        self.assertEqual(response.status_code, 200)
         
         token = list(Token.objects.all())[-1]
         self.assertTrue(token.is_approved)
@@ -113,14 +106,14 @@
         self.parameters_protected['oauth_token'] = access_token.key
         self.parameters_protected['oauth_timestamp'] = str(int(time.time()))
         
-        oauth_request = Request.from_token_and_callback(access_token, http_url='http://testserver/api/'+VERSION_STR+'/text/delete/z2c1d1fa-629d-4520-a3d2-955b4f2582c0', parameters=self.parameters_protected, http_method="DELETE")
+        oauth_request = Request.from_token_and_callback(access_token, http_url='http://testserver/api/' + VERSION_STR + '/text/delete/z2c1d1fa-629d-4520-a3d2-955b4f2582c0', parameters=self.parameters_protected, http_method="DELETE")
         signature_method = SignatureMethod_HMAC_SHA1()
         signature = signature_method.sign(oauth_request, Consumer.objects.get(name="example.com"), access_token)
 
         self.parameters_protected['oauth_signature'] = signature
-        response = self.client.delete("/api/"+VERSION_STR+"/text/delete/z2c1d1fa-629d-4520-a3d2-955b4f2582c0", self.parameters_protected)
+        response = self.client.delete("/api/" + VERSION_STR + "/text/delete/z2c1d1fa-629d-4520-a3d2-955b4f2582c0", self.parameters_protected)
         self.assertEqual(response.content, "")
-        self.assertEqual(response.status_code,200)
+        self.assertEqual(response.status_code, 200)
         
         self.client.logout()
         access_token.delete()
@@ -131,7 +124,7 @@
         ## REQUEST TOKEN
         self.parameters_request['scope'] = 'create'
         response = self.client.get("/oauth/request_token/", self.parameters_request)
-        self.assertEqual(response.status_code,200)   
+        self.assertEqual(response.status_code, 200)   
         token = list(Token.objects.all())[-1]
         data = urlparse.parse_qs(response.content)
         self.assertEqual(token.key, data["oauth_token"][0])
@@ -145,19 +138,19 @@
         }
         
         response = self.client.get("/oauth/authorize/", parameters)
-        self.assertEqual(response.status_code,302)
+        self.assertEqual(response.status_code, 302)
         self.assertTrue(token.key in response['Location'])
         
         self.client.login(username='jane', password='toto')
         
         response = self.client.get("/oauth/authorize/", parameters)
-        self.assertEqual(response.status_code,200)
-        self.assertEqual(response.content,'Fake authorize view for example.com.')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, 'Fake authorize view for example.com.')
     
         # fake authorization by the user
         parameters['authorize_access'] = 1
         response = self.client.post("/oauth/authorize/", parameters)
-        self.assertEqual(response.status_code,200)
+        self.assertEqual(response.status_code, 200)
         token = list(Token.objects.all())[-1]
         self.assertTrue(token.is_approved)
         
@@ -180,15 +173,15 @@
         self.parameters_protected['oauth_timestamp'] = str(int(time.time()))
         self.parameters_protected['content'] = '<iri><text-annotation><id>f2c1d1fa-629d-4520-a3d2-955b4f2582c0</id><uri>http://www.leezam.com/pub/epub/123456!/OPS/chapter2.xhtml#pos=56,168</uri><tags><tag>tag1</tag><tag>tag2</tag></tags><content><color>#AAAAAA</color><description><![CDATA[texte de description]]></description><title><![CDATA[titre de l\'annotation]]></title><text><![CDATA[texte selectionne lors de la creation de l\'annotation]]></text></content><meta><contributor>oaubert</contributor><contributor-id>79cd0532-1dda-4130-b351-6a181130a7c9</contributor-id><created>2010-09-06 12:33:53.417550</created><creator>oaubert</creator><creator-id>79cd0532-1dda-4130-b351-6a181130a7c9</creator-id><modified>2010-09-06 12:33:53.420459</modified></meta></text-annotation></iri>'
         
-        oauth_request = Request.from_token_and_callback(access_token, http_url='http://testserver/api/'+VERSION_STR+'/text/create/', parameters=self.parameters_protected, http_method="POST")
+        oauth_request = Request.from_token_and_callback(access_token, http_url='http://testserver/api/' + VERSION_STR + '/text/create/', parameters=self.parameters_protected, http_method="POST")
         signature_method = SignatureMethod_HMAC_SHA1()
         signature = signature_method.sign(oauth_request, Consumer.objects.get(name="example.com"), access_token)
 
         self.parameters_protected['oauth_signature'] = signature
-        response = self.client.post("/api/"+VERSION_STR+"/text/create/", self.parameters_protected)
+        response = self.client.post("/api/" + VERSION_STR + "/text/create/", self.parameters_protected)
         annot1 = lxml.etree.fromstring(response.content)
         self.assertEqual(annot1.xpath("/iri/text-annotation/meta/created/text()")[0][:11], str(datetime.datetime.now())[:11])
-        self.assertEqual(response.status_code,200)
+        self.assertEqual(response.status_code, 200)
         
         self.client.logout()
         access_token.delete()
@@ -199,7 +192,7 @@
         self.parameters_request['scope'] = 'update'
         
         response = self.client.get("/oauth/request_token/", self.parameters_request)
-        self.assertEqual(response.status_code,200)   
+        self.assertEqual(response.status_code, 200)   
         
         token = list(Token.objects.all())[-1]
         data = urlparse.parse_qs(response.content)
@@ -214,19 +207,19 @@
         }
         
         response = self.client.get("/oauth/authorize/", parameters)
-        self.assertEqual(response.status_code,302)
+        self.assertEqual(response.status_code, 302)
         self.assertTrue(token.key in response['Location'])
         
         self.client.login(username='jane', password='toto')
         
         response = self.client.get("/oauth/authorize/", parameters)
-        self.assertEqual(response.status_code,200)
-        self.assertEqual(response.content,'Fake authorize view for example.com.')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, 'Fake authorize view for example.com.')
     
         # fake authorization by the user
         parameters['authorize_access'] = 1
         response = self.client.post("/oauth/authorize/", parameters)
-        self.assertEqual(response.status_code,200)
+        self.assertEqual(response.status_code, 200)
         token = list(Token.objects.all())[-1]
         self.assertTrue(token.is_approved)
         
@@ -249,18 +242,18 @@
         self.parameters_protected['oauth_timestamp'] = str(int(time.time()))
         self.parameters_protected['content'] = '<iri><text-annotation><id></id><uri></uri><tags><tag>tag2new</tag><tag>mytag</tag></tags><content><color>#DDDDDD</color><description><![CDATA[texte de description update]]></description><title></title><text><![CDATA[texte selectionne a nouveau lors de la creation de l\'annotation]]></text></content><meta><contributor>oaubert</contributor><contributor-id>80cd0532-1dda-4130-b351-6a181130a7c9</contributor-id><created></created><creator></creator><creator-id></creator-id><modified>2010-11-06 12:33:53.420459</modified></meta></text-annotation></iri>'
         
-        oauth_request = Request.from_token_and_callback(access_token, http_url='http://testserver/api/'+VERSION_STR+'/text/update/z2c1d1fa-629d-4520-a3d2-955b4f2582c0', parameters=self.parameters_protected, http_method="PUT")
+        oauth_request = Request.from_token_and_callback(access_token, http_url='http://testserver/api/' + VERSION_STR + '/text/update/z2c1d1fa-629d-4520-a3d2-955b4f2582c0', parameters=self.parameters_protected, http_method="PUT")
         signature_method = SignatureMethod_HMAC_SHA1()
         signature = signature_method.sign(oauth_request, Consumer.objects.get(name="example.com"), access_token)
 
         self.parameters_protected['oauth_signature'] = signature
-        response = self.client.put("/api/"+VERSION_STR+"/text/update/z2c1d1fa-629d-4520-a3d2-955b4f2582c0", self.parameters_protected)
+        response = self.client.put("/api/" + VERSION_STR + "/text/update/z2c1d1fa-629d-4520-a3d2-955b4f2582c0", self.parameters_protected)
         doc = lxml.etree.fromstring(response.content)
-        self.assertEqual(doc.xpath("/iri/text-annotation/id/text()")[0],"z2c1d1fa-629d-4520-a3d2-955b4f2582c0")
-        self.assertTrue('tag3','tag1' not in doc.xpath("/iri/text-annotation/tags/tag/text()"))
-        self.assertTrue('mytag','tag2new' in doc.xpath("/iri/text-annotation/tags/tag/text()"))
-        self.assertEqual(doc.xpath("/iri/text-annotation/meta/modified/text()")[0][:11],str(datetime.datetime.now())[:11])
-        self.assertEqual(response.status_code,200)
+        self.assertEqual(doc.xpath("/iri/text-annotation/id/text()")[0], "z2c1d1fa-629d-4520-a3d2-955b4f2582c0")
+        self.assertTrue('tag3', 'tag1' not in doc.xpath("/iri/text-annotation/tags/tag/text()"))
+        self.assertTrue('mytag', 'tag2new' in doc.xpath("/iri/text-annotation/tags/tag/text()"))
+        self.assertEqual(doc.xpath("/iri/text-annotation/meta/modified/text()")[0][:11], str(datetime.datetime.now())[:11])
+        self.assertEqual(response.status_code, 200)
         
         self.client.logout()
         access_token.delete()