Merge pull request #1097 from lrnzcig/develop

failing tests for python2.6

nltk/test/unit/test_twitter_auth.py

@@ -32,10 +32,14 @@ def test_empty_subdir1(self):
         """
         try:
             self.auth.load_creds(subdir='')
+        # raises ValueError (zero length field name in format) for python 2.6
+        # OSError for the rest
         except OSError:
             pass
-        except e:
-            self.fail('Unexpected exception thrown:', e)
+        except ValueError:
+            pass
+        except Exception as e:
+            self.fail('Unexpected exception thrown: %s' % e)
         else:
             self.fail('OSError exception not thrown.')
 
@@ -49,8 +53,8 @@ def test_empty_subdir2(self):
             self.auth.load_creds()
         except ValueError:
             pass
-        except e:
-            self.fail('Unexpected exception thrown:', e)
+        except Exception as e:
+            self.fail('Unexpected exception thrown: %s' % e)
         else:
             self.fail('ValueError exception not thrown.')
 
@@ -60,10 +64,14 @@ def test_missingdir(self):
         """
         try:
             self.auth.load_creds(subdir='/nosuchdir')
+        # raises ValueError (zero length field name in format) for python 2.6
+        # OSError for the rest
         except OSError:
             pass
-        except e:
-            self.fail('Unexpected exception thrown:', e)
+        except ValueError:
+            pass
+        except Exception as e:
+            self.fail('Unexpected exception thrown: %s' % e)
         else:
             self.fail('OSError exception not thrown.')
 
@@ -75,10 +83,14 @@ def test_missingfile1(self):
         """
         try:
             self.auth.load_creds()
+        # raises ValueError (zero length field name in format) for python 2.6
+        # OSError for the rest
         except OSError:
             pass
-        except e:
-            self.fail('Unexpected exception thrown:', e)
+        except ValueError:
+            pass
+        except Exception as e:
+            self.fail('Unexpected exception thrown: %s' % e)
         else:
             self.fail('OSError exception not thrown.')
 
@@ -89,10 +101,14 @@ def test_missingfile2(self):
         """
         try:
             self.auth.load_creds(creds_file='foobar')
+        # raises ValueError (zero length field name in format) for python 2.6
+        # OSError for the rest
         except OSError:
             pass
-        except e:
-            self.fail('Unexpected exception thrown:', e)
+        except ValueError:
+            pass
+        except Exception as e:
+            self.fail('Unexpected exception thrown: %s' % e)
         else:
             self.fail('OSError exception not thrown.')
 
@@ -107,8 +123,8 @@ def test_incomplete_file(self):
                                  subdir=self.subdir)
         except ValueError:
             pass
-        except e:
-            self.fail('Unexpected exception thrown:', e)
+        except Exception as e:
+            self.fail('Unexpected exception thrown: %s' % e)
         else:
             self.fail('ValueError exception not thrown.')
 
@@ -122,8 +138,8 @@ def test_malformed_file1(self):
                                  subdir=self.subdir)
         except ValueError:
             pass
-        except e:
-            self.fail('Unexpected exception thrown:', e)
+        except Exception as e:
+            self.fail('Unexpected exception thrown: %s' % e)
         else:
             self.fail('ValueError exception not thrown.')
 
@@ -136,8 +152,8 @@ def test_malformed_file2(self):
                                  subdir=self.subdir)
         except ValueError:
             pass
-        except e:
-            self.fail('Unexpected exception thrown:', e)
+        except Exception as e:
+            self.fail('Unexpected exception thrown: %s' % e)
         else:
             self.fail('ValueError exception not thrown.')