spv-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 63
committer: F.-A. Bourbonnais <bouf10pub@xxxxxxxxxxx>
branch nick: refactor-pres-design
timestamp: Sun 2010-05-16 23:10:40 -0400
message:
  Try to fix the problem with Unicode on systems where the default locale is not UTF-8.
modified:
  slidepresenterview/tests/unit/utils/tests_uri.py
  slidepresenterview/utils/uri.py


--
lp:~bouf10/slidepresenterview/refactor-pres-design
https://code.launchpad.net/~bouf10/slidepresenterview/refactor-pres-design

Your team SlidePresenterView Development Team is subscribed to branch lp:~bouf10/slidepresenterview/refactor-pres-design.
To unsubscribe from this branch go to https://code.launchpad.net/~bouf10/slidepresenterview/refactor-pres-design/+edit-subscription

=== modified file 'slidepresenterview/tests/unit/utils/tests_uri.py'
--- slidepresenterview/tests/unit/utils/tests_uri.py	2010-05-09 05:50:36 +0000
+++ slidepresenterview/tests/unit/utils/tests_uri.py	2010-05-17 03:10:40 +0000
@@ -35,7 +35,7 @@
     return path
 
 
-class TestFilePathUnixToUri(unittest.TestCase): #pylint: disable-msg=R0904
+class TestFilePath_UnixToUri(unittest.TestCase): #pylint: disable-msg=R0904
     
     def setUp(self):
         self.path_filename = 'file.pdf'
@@ -80,7 +80,7 @@
         self.assertEquals(u'/root/sé/filé.pdf', uri.path)
         
         
-class TestFilePathWinToUri(unittest.TestCase):
+class TestFilePath_WinToUri(unittest.TestCase):
     
     def setUp(self):
         self.path_win = u'c:/document and settings/aée/My Documents/file.pdf'
@@ -90,7 +90,7 @@
         self.fail("Not implemented.")
 
 
-class TestGivenInvalidUri(unittest.TestCase):
+class TestUri_GivenInvalidUri(unittest.TestCase):
     
     def test_empty_should_raise_valueerror(self):
         self.assertRaises(ValueError, Uri, '')
@@ -103,7 +103,7 @@
         self.assertRaises(ValueError, Uri, 'http://')
 
 
-class TestGivenFullAsciiUri(unittest.TestCase):
+class TestUri_GivenAsciiUri(unittest.TestCase):
     
     def setUp(self):
         self.uri_str = "http://example.com/path/to/resource.pdf?a=1&b";
@@ -133,7 +133,7 @@
         self.assertEquals(self.uri_str, str(self.uri))
       
         
-class TestGivenUnicodeUri(unittest.TestCase): #pylint: disable-msg=R0904
+class TestUri_GivenUnicodeUri(unittest.TestCase): #pylint: disable-msg=R0904
     
     def setUp(self):
         self.uri_unicode = u"http://exaéple.com/path/t o/résource.pdf?a=é&b"
@@ -160,11 +160,11 @@
         
         
     def test_unicode_property_should_return_uri_in_unicode(self):
-        self.assertEquals(self.uri_unicode, str(self.uri))
+        self.assertEquals(self.uri_unicode, unicode(self.uri))
         self.assertTrue(isinstance(unicode(self.uri), unicode))
       
               
-class TestGivenFullFileScheme(unittest.TestCase): 
+class TestUri_GivenFileScheme(unittest.TestCase): 
     
     def setUp(self):
         self.uri_unicode = u"file:///path/to/résource?a=é"
@@ -184,7 +184,7 @@
       
       
 #pylint: disable-msg=C0103,R0904
-class TestGivenFileSchemeWithNoHeadSlashAndWithBackslash(unittest.TestCase): 
+class TestUri_GivenFileSchemeWithNoHeadSlashAndWithBackslash(unittest.TestCase): 
     
     def setUp(self):
         self.uri_unicode = u"file://c:/a é\a.pdf"

=== modified file 'slidepresenterview/utils/uri.py'
--- slidepresenterview/utils/uri.py	2010-05-09 05:50:36 +0000
+++ slidepresenterview/utils/uri.py	2010-05-17 03:10:40 +0000
@@ -75,7 +75,7 @@
     @ivar netloc: The network location
     @ivar path: The complete resource path 
     @ivar query: The query
-    @ivar uri: The full uri
+    @ivar uri: The full uri (unicode string)
     """
     
     def __init__(self, uri_string):
@@ -115,4 +115,4 @@
     
     
     def __cmp__(self, other_uri):
-        return cmp(self.uri, other_uri.uri)
\ No newline at end of file
+        return cmp(unicode(self.uri), unicode(other_uri.uri))
\ No newline at end of file