[SCM] python-libdiscid/master: Refresh

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7912aede019c86d085a22d2a62a13eb3547d8c87
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Dec 29 13:26:54 2016 +0100

    Refresh

diff --git a/debian/patches/tests-relative-imports.patch b/debian/patches/tests-relative-imports.patch
index 6589fc9..92e8ea8 100644
--- a/debian/patches/tests-relative-imports.patch
+++ b/debian/patches/tests-relative-imports.patch
@@ -2,17 +2,17 @@ Description: Use relative imports to make test suite work with DEP-8 tests
 Author: Sebastian Ramacher <sramacher at debian.org>
 Last-Update: 2014-07-03
 
---- python-libdiscid-0.4.1.orig/libdiscid/tests/test_compat_discid.py
-+++ python-libdiscid-0.4.1/libdiscid/tests/test_compat_discid.py
-@@ -30,6 +30,7 @@ except ImportError:
+--- a/libdiscid/tests/test_compat_discid.py
++++ b/libdiscid/tests/test_compat_discid.py
+@@ -29,6 +29,7 @@
  import libdiscid
  from libdiscid.compat import discid
  from libdiscid.compat.discid import DiscError, TOCError
 +from .common import PutSuccess, PutFail1, PutFail2, PutFail3, PutFail2_2, PutFail3_2
  
- # as long as Python 3.2 is supported, hack around the missing u
- try:
-@@ -81,7 +82,7 @@ class TestCompatDiscID(unittest.TestCase
+ 
+ class TestCompatDiscID(unittest.TestCase):
+@@ -75,7 +76,7 @@
      self.assertRaises(DiscError, discid.read, b'/does/not/exist')
  
    def test_put(self):
@@ -21,7 +21,7 @@ Last-Update: 2014-07-03
  
      disc = discid.put(testdata.first, testdata.last, testdata.sectors,
                        testdata.offsets)
-@@ -111,29 +112,29 @@ class TestCompatDiscID(unittest.TestCase
+@@ -105,29 +106,29 @@
  
    def test_put_fail_1(self):
      # !(first < last)
@@ -56,19 +56,19 @@ Last-Update: 2014-07-03
      self.assertRaises(TOCError, discid.put, testdata.first, testdata.last,
                        testdata.sectors, testdata.offsets)
  
---- python-libdiscid-0.4.1.orig/libdiscid/tests/test_libdiscid.py
-+++ python-libdiscid-0.4.1/libdiscid/tests/test_libdiscid.py
-@@ -28,8 +28,8 @@ try:
- except ImportError:
-   import unittest
+--- a/libdiscid/tests/test_libdiscid.py
++++ b/libdiscid/tests/test_libdiscid.py
+@@ -27,8 +27,8 @@
+ 
+ import unittest
  import libdiscid
 -import libdiscid.tests.common
  from libdiscid import DiscError
 +from .common import PutSuccess, PutFail1, PutFail2, PutFail3, PutFail2_2, PutFail3_2
  
- # as long as Python 3.2 is supported, hack around the missing u
- try:
-@@ -72,7 +72,7 @@ class TestLibDiscId(unittest.TestCase):
+ 
+ class TestLibDiscId(unittest.TestCase):
+@@ -66,7 +66,7 @@
      self.assertRaises(NotImplementedError, libdiscid.read)
  
    def test_put(self):
@@ -77,7 +77,7 @@ Last-Update: 2014-07-03
  
      disc = libdiscid.put(testdata.first, testdata.last, testdata.sectors,
                           testdata.offsets)
-@@ -106,29 +106,29 @@ class TestLibDiscId(unittest.TestCase):
+@@ -100,29 +100,29 @@
  
    def test_put_fail_1(self):
      # !(first < last)

-- 
python-libdiscid packaging