remove patch

4 files changed, 3 insertions, 602 deletions

diff --git a/.SRCINFO b/.SRCINFO
index acc53a11d8e4..91a92066af5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-sonnet-git
 	pkgdesc = TensorFlow-based neural network library.
 	pkgver = 9d209830
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/deepmind/sonnet
 	arch = i686
 	arch = x86_64
@@ -17,11 +17,7 @@ pkgbase = python-sonnet-git
 	provides = python-sonnet
 	conflicts = python-sonnet
 	source = git+https://github.com/deepmind/sonnet
-	source = 10.patch
-	source = 6.patch
 	md5sums = SKIP
-	md5sums = 59576111303e2ab99bf106fe0dcd5ff8
-	md5sums = 67cb9424d7c8e01f822de1a4d7787c98
 
 pkgname = python-sonnet-git
 
diff --git a/10.patch b/10.patch
deleted file mode 100644
index 09087e5f4950..000000000000
--- a/10.patch
+++ /dev/null
@@ -1,573 +0,0 @@
-From 083515c1b58437e98c4ebd5935bd791d31a3a007 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
-Date: Sun, 9 Apr 2017 18:01:50 +0200
-Subject: [PATCH] fixes for python3 compatibility
-
----
- sonnet/examples/module_with_build_args.py          |  2 +-
- sonnet/examples/rnn_shakespeare.py                 |  4 +--
- sonnet/python/modules/base.py                      |  2 +-
- sonnet/python/modules/base_test.py                 |  7 +++--
- sonnet/python/modules/basic.py                     |  1 +
- sonnet/python/modules/basic_rnn_test.py            |  1 +
- sonnet/python/modules/basic_test.py                |  1 +
- sonnet/python/modules/batch_norm.py                | 10 +++----
- sonnet/python/modules/block_matrix.py              |  1 +
- sonnet/python/modules/conv_test.py                 | 12 ++++----
- sonnet/python/modules/nets/convnet.py              |  1 +
- sonnet/python/modules/nets/mlp.py                  |  1 +
- sonnet/python/modules/rnn_core.py                  |  1 +
- sonnet/python/modules/sequential_test.py           |  4 ++-
- sonnet/python/modules/spatial_transformer.py       |  3 +-
- sonnet/python/modules/util.py                      | 11 +++++--
- sonnet/python/ops/nest.py                          |  4 +--
- sonnet/python/ops/nest_test.py                     | 34 ++++++++++++----------
- sonnet/python/ops/resampler_test.py                |  1 +
- sonnet/testing/parameterized/parameterized.py      | 14 ++++-----
- sonnet/testing/parameterized/parameterized_test.py |  6 +++-
- 21 files changed, 74 insertions(+), 47 deletions(-)
-
-diff --git a/sonnet/examples/module_with_build_args.py b/sonnet/examples/module_with_build_args.py
-index e647cf2..dfe3d73 100644
---- a/sonnet/examples/module_with_build_args.py
-+++ b/sonnet/examples/module_with_build_args.py
-@@ -72,7 +72,7 @@ def main(unused_argv):
- 
-   with tf.Session() as sess:
-     sess.run(tf.global_variables_initializer())
--    for _ in xrange(100):
-+    for _ in range(100):
-       sess.run(train_step)
-     # Check that evaluating train_model_outputs twice returns the same value.
-     train_outputs, train_outputs_2 = sess.run([train_model_outputs,
-diff --git a/sonnet/examples/rnn_shakespeare.py b/sonnet/examples/rnn_shakespeare.py
-index b4a9876..2fb9a19 100644
---- a/sonnet/examples/rnn_shakespeare.py
-+++ b/sonnet/examples/rnn_shakespeare.py
-@@ -151,7 +151,7 @@ def generate_string(self, initial_logits, initial_state, sequence_length):
-     current_state = initial_state
- 
-     generated_letters = []
--    for _ in xrange(sequence_length):
-+    for _ in range(sequence_length):
-       # Sample a character index from distribution.
-       char_index = tf.squeeze(tf.multinomial(current_logits, 1))
-       char_one_hot = tf.one_hot(char_index, self._output_size, 1.0, 0.0)
-@@ -270,7 +270,7 @@ def train(num_training_iterations, report_interval,
- 
-     start_iteration = sess.run(global_step)
- 
--    for train_iteration in xrange(start_iteration, num_training_iterations):
-+    for train_iteration in range(start_iteration, num_training_iterations):
-       if (train_iteration + 1) % report_interval == 0:
-         train_loss_v, valid_loss_v, _ = sess.run(
-             (train_loss, valid_loss, train_step))
-diff --git a/sonnet/python/modules/base.py b/sonnet/python/modules/base.py
-index 84084a3..cd4f07d 100644
---- a/sonnet/python/modules/base.py
-+++ b/sonnet/python/modules/base.py
-@@ -130,7 +130,7 @@ def __init__(self, name=None):
-       ValueError: If name is not specified.
-     """
- 
--    if name is None or not isinstance(name, types.StringTypes):
-+    if name is None or not isinstance(name, six.string_types):
-       raise ValueError("Name must be a string.")
- 
-     self._connected_subgraphs = []
-diff --git a/sonnet/python/modules/base_test.py b/sonnet/python/modules/base_test.py
-index 0242ae7..83358e1 100644
---- a/sonnet/python/modules/base_test.py
-+++ b/sonnet/python/modules/base_test.py
-@@ -22,6 +22,7 @@
- from functools import partial
- 
- import numpy as np
-+import six
- from sonnet.python.modules import base
- import tensorflow as tf
- 
-@@ -62,8 +63,10 @@ def testInitializerKeys(self):
-     self.assertEqual(keys, {"foo", "bar"})
-     keys = ModuleWithNoInitializerKeys.get_possible_initializer_keys()
-     self.assertEqual(keys, set())
-+    msg = ("missing 1 required positional argument" if six.PY3
-+           else "takes exactly 2 arguments")
-     self.assertRaisesRegexp(
--        TypeError, "takes exactly 2 arguments",
-+        TypeError, msg,
-         ModuleWithCustomInitializerKeys.get_possible_initializer_keys)
-     keys = ModuleWithCustomInitializerKeys.get_possible_initializer_keys(True)
-     self.assertEqual(keys, {"foo"})
-@@ -146,7 +149,7 @@ def testFunctionType(self):
-     with self.assertRaises(TypeError) as cm:
-       base.Module(build="not_a_function")
- 
--    self.assertEqual(cm.exception.message, "Input 'build' must be callable.")
-+    self.assertEqual(str(cm.exception), "Input 'build' must be callable.")
- 
-   def testSharing(self):
-     batch_size = 3
-diff --git a/sonnet/python/modules/basic.py b/sonnet/python/modules/basic.py
-index c6ebda2..9bc143c 100644
---- a/sonnet/python/modules/basic.py
-+++ b/sonnet/python/modules/basic.py
-@@ -27,6 +27,7 @@
- # Dependency imports
- 
- import numpy as np
-+from six.moves import xrange  # pylint: disable=redefined-builtin
- from sonnet.python.modules import base
- from sonnet.python.modules import util
- from sonnet.python.ops import nest
-diff --git a/sonnet/python/modules/basic_rnn_test.py b/sonnet/python/modules/basic_rnn_test.py
-index f076f1b..14e9750 100644
---- a/sonnet/python/modules/basic_rnn_test.py
-+++ b/sonnet/python/modules/basic_rnn_test.py
-@@ -22,6 +22,7 @@
- 
- # Dependency imports
- import numpy as np
-+from six.moves import xrange  # pylint: disable=redefined-builtin
- import sonnet as snt
- from sonnet.testing import parameterized
- import tensorflow as tf
-diff --git a/sonnet/python/modules/basic_test.py b/sonnet/python/modules/basic_test.py
-index 693ad67..2632f26 100644
---- a/sonnet/python/modules/basic_test.py
-+++ b/sonnet/python/modules/basic_test.py
-@@ -23,6 +23,7 @@
- # Dependency imports
- 
- import numpy as np
-+from six.moves import xrange  # pylint: disable=redefined-builtin
- import sonnet as snt
- from sonnet.testing import parameterized
- import tensorflow as tf
-diff --git a/sonnet/python/modules/batch_norm.py b/sonnet/python/modules/batch_norm.py
-index eb0cc58..cf8723a 100644
---- a/sonnet/python/modules/batch_norm.py
-+++ b/sonnet/python/modules/batch_norm.py
-@@ -306,7 +306,7 @@ def _infer_fused_data_format(self, input_batch):
-       # Reduce over the second dimension.
-       return "NCHW"
-     else:
--      raise ValueError("Invalid axis option {:s}. This does not correspond to"
-+      raise ValueError("Invalid axis option {}. This does not correspond to"
-                        " either the NHWC format (0, 1, 2) or the NCHW "
-                        "(0, 2, 3).".format(axis))
- 
-@@ -439,23 +439,23 @@ def _build(self, input_batch, is_training=True, test_local_stats=True):
-     if self._axis is not None:
-       if len(self._axis) > len(input_shape):
-         raise base.IncompatibleShapeError(
--            "Too many indices specified in axis: len({:s}) > len({:s}).".format(
-+            "Too many indices specified in axis: len({}) > len({}).".format(
-                 self._axis, input_shape))
- 
-       if max(self._axis) >= len(input_shape):
-         raise base.IncompatibleShapeError(
-             "One or more index in axis is too large for "
--            "input shape: {:s} >= {:d}.".format(self._axis, len(input_shape)))
-+            "input shape: {} >= {:d}.".format(self._axis, len(input_shape)))
- 
-       if min(self._axis) < 0:
-         raise base.IncompatibleShapeError(
--            "Indices in axis must be non-negative: {:s} < 0.".format(
-+            "Indices in axis must be non-negative: {} < 0.".format(
-                 self._axis))
- 
-       axis = self._axis
-     else:
-       # Reduce over all dimensions except the last.
--      axis = range(len(input_shape))[:-1]
-+      axis = tuple(range(len(input_shape))[:-1])
- 
-     # See following for important note on accuracy for dtype=tf.float16
-     # https://github.com/tensorflow/tensorflow/blob/master/tensorflow/python/ops/nn_impl.py#L63
-diff --git a/sonnet/python/modules/block_matrix.py b/sonnet/python/modules/block_matrix.py
-index 1e459d9..b4d5f90 100644
---- a/sonnet/python/modules/block_matrix.py
-+++ b/sonnet/python/modules/block_matrix.py
-@@ -19,6 +19,7 @@
- from __future__ import print_function
- 
- # Dependency imports
-+from six.moves import xrange  # pylint: disable=redefined-builtin
- from sonnet.python.modules import base
- import tensorflow as tf
- 
-diff --git a/sonnet/python/modules/conv_test.py b/sonnet/python/modules/conv_test.py
-index 2865de4..5148e89 100644
---- a/sonnet/python/modules/conv_test.py
-+++ b/sonnet/python/modules/conv_test.py
-@@ -718,7 +718,7 @@ def testMaskErrorInvalidRank(self):
-     with self.assertRaises(snt.Error) as cm:
-       snt.Conv2D(output_channels=4, kernel_shape=3, mask=mask)
-     self.assertEqual(
--        cm.exception.message,
-+        str(cm.exception),
-         "Invalid mask rank: {}".format(mask.ndim))
- 
-   def testMaskErrorInvalidType(self):
-@@ -728,7 +728,7 @@ def testMaskErrorInvalidType(self):
-     with self.assertRaises(TypeError) as cm:
-       snt.Conv2D(output_channels=4, kernel_shape=3, mask=mask)
-     self.assertEqual(
--        cm.exception.message, "Invalid type for mask: {}".format(type(mask)))
-+        str(cm.exception), "Invalid type for mask: {}".format(type(mask)))
- 
-   def testMaskErrorIncompatibleRank2(self):
-     """Errors are thrown for incompatible rank 2 mask."""
-@@ -737,8 +737,8 @@ def testMaskErrorIncompatibleRank2(self):
-     x = tf.constant(0.0, shape=(2, 8, 8, 6))
-     with self.assertRaises(snt.Error) as cm:
-       snt.Conv2D(output_channels=4, kernel_shape=5, mask=mask)(x)
--    self.assertEqual(
--        cm.exception.message, "Invalid mask shape: {}".format(mask.shape))
-+    self.assertTrue(str(cm.exception).startswith(
-+        "Invalid mask shape: {}".format(mask.shape)))
- 
-   def testMaskErrorIncompatibleRank4(self):
-     """Errors are thrown for incompatible rank 4 mask."""
-@@ -747,8 +747,8 @@ def testMaskErrorIncompatibleRank4(self):
-     x = tf.constant(0.0, shape=(2, 8, 8, 6))
-     with self.assertRaises(snt.Error) as cm:
-       snt.Conv2D(output_channels=4, kernel_shape=5, mask=mask)(x)
--    self.assertEqual(
--        cm.exception.message, "Invalid mask shape: {}".format(mask.shape))
-+    self.assertTrue(str(cm.exception).startswith(
-+        "Invalid mask shape: {}".format(mask.shape)))
- 
- 
- class Conv2DTransposeTest(parameterized.ParameterizedTestCase,
-diff --git a/sonnet/python/modules/nets/convnet.py b/sonnet/python/modules/nets/convnet.py
-index ec61769..8393491 100644
---- a/sonnet/python/modules/nets/convnet.py
-+++ b/sonnet/python/modules/nets/convnet.py
-@@ -20,6 +20,7 @@
- 
- import collections
- 
-+from six.moves import xrange  # pylint: disable=redefined-builtin
- from sonnet.python.modules import base
- from sonnet.python.modules import batch_norm
- from sonnet.python.modules import conv
-diff --git a/sonnet/python/modules/nets/mlp.py b/sonnet/python/modules/nets/mlp.py
-index c9febd2..3f2f4ca 100644
---- a/sonnet/python/modules/nets/mlp.py
-+++ b/sonnet/python/modules/nets/mlp.py
-@@ -20,6 +20,7 @@
- 
- import collections
- 
-+from six.moves import xrange  # pylint: disable=redefined-builtin
- from sonnet.python.modules import base
- from sonnet.python.modules import basic
- from sonnet.python.modules import util
-diff --git a/sonnet/python/modules/rnn_core.py b/sonnet/python/modules/rnn_core.py
-index 965a8a5..fdf0d65 100644
---- a/sonnet/python/modules/rnn_core.py
-+++ b/sonnet/python/modules/rnn_core.py
-@@ -29,6 +29,7 @@
- # Dependency imports
- 
- import six
-+from six.moves import xrange  # pylint: disable=redefined-builtin
- from sonnet.python.modules import base
- from sonnet.python.modules import basic
- import tensorflow as tf
-diff --git a/sonnet/python/modules/sequential_test.py b/sonnet/python/modules/sequential_test.py
-index d625604..298a210 100644
---- a/sonnet/python/modules/sequential_test.py
-+++ b/sonnet/python/modules/sequential_test.py
-@@ -19,6 +19,7 @@
- from __future__ import print_function
- 
- # Dependency imports
-+import six
- import sonnet as snt
- import tensorflow as tf
- 
-@@ -60,7 +61,8 @@ def module1(a, b):
-     def module2(a, b, c):
-       return a, b, c
- 
--    err_str = r"module2\(\) takes exactly 3 arguments \(2 given\)"
-+    err_str = (r"module2\(\) missing 1 required positional argument: 'c'" if six.PY3
-+               else r"module2\(\) takes exactly 3 arguments \(2 given\)")
-     with self.assertRaisesRegexp(TypeError, err_str):
-       _, _ = snt.Sequential([module1, module2], name="seq2")(1, 2)
- 
-diff --git a/sonnet/python/modules/spatial_transformer.py b/sonnet/python/modules/spatial_transformer.py
-index 74dabba..a92088b 100644
---- a/sonnet/python/modules/spatial_transformer.py
-+++ b/sonnet/python/modules/spatial_transformer.py
-@@ -23,6 +23,7 @@
- 
- # Dependency imports
- import numpy as np
-+from six.moves import xrange  # pylint: disable=redefined-builtin
- from sonnet.python.modules import base
- from sonnet.python.modules import basic
- import tensorflow as tf
-@@ -419,7 +420,7 @@ def _affine_grid_warper_inverse(inputs):
-       index = iter(range(6))
-       def get_variable(constraint):
-         if constraint is None:
--          i = index.next()
-+          i = next(index)
-           return inputs[:, i:i+1]
-         else:
-           return tf.fill(constant_shape, tf.constant(constraint,
-diff --git a/sonnet/python/modules/util.py b/sonnet/python/modules/util.py
-index b9b098c..a80ddec 100644
---- a/sonnet/python/modules/util.py
-+++ b/sonnet/python/modules/util.py
-@@ -21,6 +21,7 @@
- import re
- 
- # Dependency imports
-+import six
- import tensorflow as tf
- 
- 
-@@ -79,7 +80,7 @@ def _check_nested_callables(dictionary, object_name):
-     TypeError: If the dictionary contains something that is not either a
-       dictionary or a callable.
-   """
--  for key, entry in dictionary.iteritems():
-+  for key, entry in six.iteritems(dictionary):
-     if isinstance(entry, dict):
-       _check_nested_callables(entry, object_name)
-     elif not callable(entry):
-@@ -308,7 +309,13 @@ def get_saver(scope, collections=(tf.GraphKeys.GLOBAL_VARIABLES,),
- 
- def has_variable_scope(obj):
-   """Determines whether the given object has a variable scope."""
--  return hasattr(obj, "variable_scope") or "variable_scope" in dir(obj)
-+  try:
-+    if hasattr(obj, "variable_scope"):
-+      return True
-+  except Exception:
-+    pass
-+
-+  return "variable_scope" in dir(obj)
- 
- 
- def _format_table(rows):
-diff --git a/sonnet/python/ops/nest.py b/sonnet/python/ops/nest.py
-index 4516895..21afaa8 100644
---- a/sonnet/python/ops/nest.py
-+++ b/sonnet/python/ops/nest.py
-@@ -290,7 +290,7 @@ def map(fn_or_op, *inputs):  # pylint: disable=redefined-builtin
- def _sorted(dict_):
-   """Returns a sorted list from the dict, with error if keys not sortable."""
-   try:
--    return sorted(dict_.iterkeys())
-+    return sorted(six.iterkeys(dict_))
-   except TypeError:
-     raise TypeError("nest only supports dicts with sortable keys.")
- 
-@@ -307,7 +307,7 @@ def _iterable_like(instance, args):
-     `args` with the type of `instance`.
-   """
-   if isinstance(instance, collections.OrderedDict):
--    return collections.OrderedDict(zip(instance.iterkeys(), args))
-+    return collections.OrderedDict(zip(six.iterkeys(instance), args))
-   elif isinstance(instance, dict):
-     return dict(zip(_sorted(instance), args))
-   elif (isinstance(instance, tuple) and
-diff --git a/sonnet/python/ops/nest_test.py b/sonnet/python/ops/nest_test.py
-index 32319a8..7ec9dca 100644
---- a/sonnet/python/ops/nest_test.py
-+++ b/sonnet/python/ops/nest_test.py
-@@ -24,9 +24,11 @@
- # Dependency imports
- 
- import numpy as np
-+import six
- from sonnet.python.ops import nest
- import tensorflow as tf
- 
-+typekw = "class" if six.PY3 else "type"
- 
- class NestTest(tf.test.TestCase):
- 
-@@ -35,7 +37,7 @@ def testAssertShallowStructure(self):
-     inp_abc = ["a", "b", "c"]
-     with self.assertRaises(ValueError) as cm:
-       nest.assert_shallow_structure(inp_abc, inp_ab)
--    self.assertEqual(cm.exception.message,
-+    self.assertEqual(str(cm.exception),
-                      "The two structures don't have the same sequence length. "
-                      "Input structure has length 2, while shallow structure "
-                      "has length 3.")
-@@ -44,10 +46,10 @@ def testAssertShallowStructure(self):
-     inp_ab2 = [[1, 1], [2, 2]]
-     with self.assertRaises(TypeError) as cm:
-       nest.assert_shallow_structure(inp_ab2, inp_ab1)
--    self.assertEqual(cm.exception.message,
-+    self.assertEqual(str(cm.exception),
-                      "The two structures don't have the same sequence type. "
--                     "Input structure has type <type 'tuple'>, while shallow "
--                     "structure has type <type 'list'>.")
-+                     "Input structure has type <{0} 'tuple'>, while shallow "
-+                     "structure has type <{0} 'list'>.".format(typekw))
- 
-   def testFlattenUpTo(self):
-     # Normal application (Example 1).
-@@ -123,9 +125,9 @@ def testFlattenUpTo(self):
-     with self.assertRaises(TypeError) as cm:
-       flattened_input_tree = nest.flatten_up_to(shallow_tree, input_tree)
-     flattened_shallow_tree = nest.flatten_up_to(shallow_tree, shallow_tree)
--    self.assertEqual(cm.exception.message,
--                     "If shallow structure is a sequence, input must also "
--                     "be a sequence. Input has type: <type 'str'>.")
-+    self.assertEqual(str(cm.exception),
-+                     "If shallow structure is a sequence, input must also be "
-+                     "a sequence. Input has type: <{} 'str'>.".format(typekw))
-     self.assertEqual(flattened_shallow_tree, shallow_tree)
- 
-     input_tree = "input_tree"
-@@ -133,9 +135,9 @@ def testFlattenUpTo(self):
-     with self.assertRaises(TypeError) as cm:
-       flattened_input_tree = nest.flatten_up_to(shallow_tree, input_tree)
-     flattened_shallow_tree = nest.flatten_up_to(shallow_tree, shallow_tree)
--    self.assertEqual(cm.exception.message,
--                     "If shallow structure is a sequence, input must also "
--                     "be a sequence. Input has type: <type 'str'>.")
-+    self.assertEqual(str(cm.exception),
-+                     "If shallow structure is a sequence, input must also be "
-+                     "a sequence. Input has type: <{} 'str'>.".format(typekw))
-     self.assertEqual(flattened_shallow_tree, shallow_tree)
- 
-     # Using non-iterable elements.
-@@ -144,9 +146,9 @@ def testFlattenUpTo(self):
-     with self.assertRaises(TypeError) as cm:
-       flattened_input_tree = nest.flatten_up_to(shallow_tree, input_tree)
-     flattened_shallow_tree = nest.flatten_up_to(shallow_tree, shallow_tree)
--    self.assertEqual(cm.exception.message,
--                     "If shallow structure is a sequence, input must also "
--                     "be a sequence. Input has type: <type 'int'>.")
-+    self.assertEqual(str(cm.exception),
-+                     "If shallow structure is a sequence, input must also be "
-+                     "a sequence. Input has type: <{} 'int'>.".format(typekw))
-     self.assertEqual(flattened_shallow_tree, shallow_tree)
- 
-     input_tree = 0
-@@ -154,9 +156,9 @@ def testFlattenUpTo(self):
-     with self.assertRaises(TypeError) as cm:
-       flattened_input_tree = nest.flatten_up_to(shallow_tree, input_tree)
-     flattened_shallow_tree = nest.flatten_up_to(shallow_tree, shallow_tree)
--    self.assertEqual(cm.exception.message,
--                     "If shallow structure is a sequence, input must also "
--                     "be a sequence. Input has type: <type 'int'>.")
-+    self.assertEqual(str(cm.exception),
-+                     "If shallow structure is a sequence, input must also be "
-+                     "a sequence. Input has type: <{} 'int'>.".format(typekw))
-     self.assertEqual(flattened_shallow_tree, shallow_tree)
- 
-   def testMapUpTo(self):
-diff --git a/sonnet/python/ops/resampler_test.py b/sonnet/python/ops/resampler_test.py
-index 5a298a6..186f016 100644
---- a/sonnet/python/ops/resampler_test.py
-+++ b/sonnet/python/ops/resampler_test.py
-@@ -22,6 +22,7 @@
- # Dependency imports
- 
- import numpy as np
-+from six.moves import xrange  # pylint: disable=redefined-builtin
- import sonnet as snt
- from sonnet.testing import parameterized
- 
-diff --git a/sonnet/testing/parameterized/parameterized.py b/sonnet/testing/parameterized/parameterized.py
-index d2e432e..36b6c66 100644
---- a/sonnet/testing/parameterized/parameterized.py
-+++ b/sonnet/testing/parameterized/parameterized.py
-@@ -147,6 +147,7 @@ def testSumIsZero(self, arg):
- import unittest
- import uuid
- 
-+import six
- from tensorflow.python.platform import googletest
- 
- ADDR_RE = re.compile(r'\<([a-zA-Z0-9_\-\.]+) object at 0x[a-fA-F0-9]+\>')
-@@ -167,13 +168,13 @@ def _StrClass(cls):
- 
- def _NonStringIterable(obj):
-   return (isinstance(obj, collections.Iterable) and not
--          isinstance(obj, basestring))
-+          isinstance(obj, six.string_types))
- 
- 
- def _FormatParameterList(testcase_params):
-   if isinstance(testcase_params, collections.Mapping):
-     return ', '.join('%s=%s' % (argname, _CleanRepr(value))
--                     for argname, value in testcase_params.iteritems())
-+                     for argname, value in six.iteritems(testcase_params))
-   elif _NonStringIterable(testcase_params):
-     return ', '.join(map(_CleanRepr, testcase_params))
-   else:
-@@ -265,7 +266,7 @@ def _ModifyClass(class_object, testcases, naming_type):
-       'Cannot add parameters to %s,'
-       ' which already has parameterized methods.' % (class_object,))
-   class_object._id_suffix = id_suffix = {}
--  for name, obj in class_object.__dict__.items():
-+  for name, obj in list(six.iteritems(class_object.__dict__)):
-     if (name.startswith(unittest.TestLoader.testMethodPrefix)
-         and isinstance(obj, types.FunctionType)):
-       delattr(class_object, name)
-@@ -273,7 +274,7 @@ def _ModifyClass(class_object, testcases, naming_type):
-       _UpdateClassDictForParamTestCase(
-           methods, id_suffix, name,
-           _ParameterizedTestIter(obj, testcases, naming_type))
--      for name, meth in methods.iteritems():
-+      for name, meth in six.iteritems(methods):
-         setattr(class_object, name, meth)
- 
- 
-@@ -353,7 +354,7 @@ class TestGeneratorMetaclass(type):
- 
-   def __new__(mcs, class_name, bases, dct):
-     dct['_id_suffix'] = id_suffix = {}
--    for name, obj in dct.items():
-+    for name, obj in list(six.iteritems(dct)):
-       if (name.startswith(unittest.TestLoader.testMethodPrefix) and
-           _NonStringIterable(obj)):
-         iterator = iter(obj)
-@@ -385,9 +386,8 @@ def _UpdateClassDictForParamTestCase(dct, id_suffix, name, iterator):
-     id_suffix[new_name] = getattr(func, '__x_extra_id__', '')
- 
- 
--class ParameterizedTestCase(googletest.TestCase):
-+class ParameterizedTestCase(six.with_metaclass(TestGeneratorMetaclass,googletest.TestCase)):
-   """Base class for test cases using the Parameters decorator."""
--  __metaclass__ = TestGeneratorMetaclass
- 
-   def _OriginalName(self):
-     return self._testMethodName.split(_SEPARATOR)[0]
-diff --git a/sonnet/testing/parameterized/parameterized_test.py b/sonnet/testing/parameterized/parameterized_test.py
-index 1d33881..df78a38 100644
---- a/sonnet/testing/parameterized/parameterized_test.py
-+++ b/sonnet/testing/parameterized/parameterized_test.py
-@@ -19,6 +19,8 @@
- import unittest
- 
- # Dependency imports
-+import six
-+from six.moves import xrange  # pylint: disable=redefined-builtin
- from sonnet.testing import parameterized
- 
- from tensorflow.python.platform import googletest
-@@ -392,7 +394,9 @@ def testSomething(unused_self, unused_obj):  # pylint: disable=invalid-name
- 
-     expected_testcases = [1, 2, 3, 4, 5, 6]
-     self.assertTrue(hasattr(testSomething, 'testcases'))
--    self.assertItemsEqual(expected_testcases, testSomething.testcases)
-+    assertItemsEqual = (self.assertCountEqual if six.PY3
-+                        else self.assertItemsEqual)
-+    assertItemsEqual(expected_testcases, testSomething.testcases)
- 
-   def testChainedDecorator(self):
-     ts = unittest.makeSuite(self.ChainedTests)
diff --git a/6.patch b/6.patch
deleted file mode 100644
index 9f06a6d9e27f..000000000000
--- a/6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/sonnet/cc/kernels/resampler_op.cc b/sonnet/cc/kernels/resampler_op.cc
-index 4e567ca..e09ce12 100644
---- a/sonnet/cc/kernels/resampler_op.cc
-+++ b/sonnet/cc/kernels/resampler_op.cc
-@@ -48,8 +48,8 @@ struct Resampler2DFunctor<CPUDevice, T>{
-                    const int data_width,
-                    const int data_channels,
-                    const int num_sampling_points){
--    const int warp_batch_stride = num_sampling_points * 2;
--    const int data_batch_stride = data_height * data_width * data_channels;
-+    int warp_batch_stride = num_sampling_points * 2;
-+    int data_batch_stride = data_height * data_width * data_channels;
-     const int output_batch_stride = num_sampling_points * data_channels;
-     const T zero = static_cast<T>(0.0);
-     const T one = static_cast<T>(1.0);
diff --git a/PKGBUILD b/PKGBUILD
index d581aa4a1a1f..47d871e20fe9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=python-sonnet-git
 pkgver=9d209830
-pkgrel=2
+pkgrel=3
 
 pkgdesc="TensorFlow-based neural network library."
 url="https://github.com/deepmind/sonnet"
@@ -17,12 +17,8 @@ makedepends=('git' 'python-pip' 'bazel')
 optdepends=('cuda: GPU support'
             'cudnn: GPU support')
 source=("git+https://github.com/deepmind/sonnet"
-        "10.patch" # for py3
-        "6.patch" # fix compile time error
         )
-md5sums=('SKIP'
-         '59576111303e2ab99bf106fe0dcd5ff8'
-         '67cb9424d7c8e01f822de1a4d7787c98')
+md5sums=('SKIP')
 
 pkgver() {
   cd ${srcdir}/sonnet
@@ -33,9 +29,6 @@ pkgver() {
 prepare() {
    cd ${srcdir}/sonnet
    
-   patch -Np1 -i $srcdir/6.patch # fix compile time error
-   patch -Np1 -i $srcdir/10.patch # for py3
-   
    git submodule update --init --recursive
 }