Convert nose.tools.assert_* functions into asserts

1 files changed, 34 insertions, 34 deletions

diff --git a/networkx/readwrite/tests/test_gexf.py b/networkx/readwrite/tests/test_gexf.py
index ef3b6b84..5ad7b2b4 100644
--- a/networkx/readwrite/tests/test_gexf.py
+++ b/networkx/readwrite/tests/test_gexf.py
@@ -142,9 +142,9 @@ org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gexf.net/\
     def test_read_simple_directed_graphml(self):
         G = self.simple_directed_graph
         H = nx.read_gexf(self.simple_directed_fh)
-        assert_equal(sorted(G.nodes()), sorted(H.nodes()))
-        assert_equal(sorted(G.edges()), sorted(H.edges()))
-        assert_equal(sorted(G.edges(data=True)),
+        assert sorted(G.nodes()) == sorted(H.nodes())
+        assert sorted(G.edges()) == sorted(H.edges())
+        assert (sorted(G.edges(data=True)) ==
                      sorted(H.edges(data=True)))
         self.simple_directed_fh.seek(0)
 
@@ -154,29 +154,29 @@ org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gexf.net/\
         nx.write_gexf(G, fh)
         fh.seek(0)
         H = nx.read_gexf(fh)
-        assert_equal(sorted(G.nodes()), sorted(H.nodes()))
-        assert_equal(sorted(G.edges()), sorted(H.edges()))
-        assert_equal(sorted(G.edges(data=True)),
+        assert sorted(G.nodes()) == sorted(H.nodes())
+        assert sorted(G.edges()) == sorted(H.edges())
+        assert (sorted(G.edges(data=True)) ==
                      sorted(H.edges(data=True)))
         self.simple_directed_fh.seek(0)
 
     def test_read_simple_undirected_graphml(self):
         G = self.simple_undirected_graph
         H = nx.read_gexf(self.simple_undirected_fh)
-        assert_equal(sorted(G.nodes()), sorted(H.nodes()))
-        assert_equal(
-            sorted(sorted(e) for e in G.edges()),
+        assert sorted(G.nodes()) == sorted(H.nodes())
+        assert (
+            sorted(sorted(e) for e in G.edges()) ==
             sorted(sorted(e) for e in H.edges()))
         self.simple_undirected_fh.seek(0)
 
     def test_read_attribute_graphml(self):
         G = self.attribute_graph
         H = nx.read_gexf(self.attribute_fh)
-        assert_equal(sorted(G.nodes(True)), sorted(H.nodes(data=True)))
+        assert sorted(G.nodes(True)) == sorted(H.nodes(data=True))
         ge = sorted(G.edges(data=True))
         he = sorted(H.edges(data=True))
         for a, b in zip(ge, he):
-            assert_equal(a, b)
+            assert a == b
         self.attribute_fh.seek(0)
 
     def test_directed_edge_in_undirected(self):
@@ -250,7 +250,7 @@ org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gexf.net/\
 """
         fh = io.BytesIO(s.encode('UTF-8'))
         G = nx.read_gexf(fh, relabel=True)
-        assert_equal(sorted(G.nodes()), ["Hello", "Word"])
+        assert sorted(G.nodes()) == ["Hello", "Word"]
 
     def test_default_attribute(self):
         G = nx.Graph()
@@ -263,15 +263,15 @@ org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gexf.net/\
         nx.write_gexf(G, fh)
         fh.seek(0)
         H = nx.read_gexf(fh, node_type=int)
-        assert_equal(sorted(G.nodes()), sorted(H.nodes()))
-        assert_equal(
-            sorted(sorted(e) for e in G.edges()),
+        assert sorted(G.nodes()) == sorted(H.nodes())
+        assert (
+            sorted(sorted(e) for e in G.edges()) ==
             sorted(sorted(e) for e in H.edges()))
         # Reading a gexf graph always sets mode attribute to either
         # 'static' or 'dynamic'. Remove the mode attribute from the
         # read graph for the sake of comparing remaining attributes.
         del H.graph['mode']
-        assert_equal(G.graph, H.graph)
+        assert G.graph == H.graph
 
     def test_serialize_ints_to_strings(self):
         G = nx.Graph()
@@ -280,8 +280,8 @@ org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gexf.net/\
         nx.write_gexf(G, fh)
         fh.seek(0)
         H = nx.read_gexf(fh, node_type=int)
-        assert_equal(list(H), [7])
-        assert_equal(H.nodes[7]['label'], '77')
+        assert list(H) == [7]
+        assert H.nodes[7]['label'] == '77'
 
 # FIXME: We should test xml without caring about their order This is causing a
 # problem b/c of a change in Python 3.8
@@ -351,7 +351,7 @@ gexf.xsd" version="1.2">
   </graph>
 </gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__)
         obtained = '\n'.join(nx.generate_gexf(G))
-        assert_equal(expected, obtained)
+        assert expected == obtained
 
     def test_edge_id_construct(self):
         G = nx.Graph()
@@ -402,7 +402,7 @@ gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd" version="1.2">
 </gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__)
 
         obtained = '\n'.join(nx.generate_gexf(G))
-        assert_equal(expected, obtained)
+        assert expected == obtained
 
     def test_numpy_type(self):
         G = nx.path_graph(4)
@@ -460,7 +460,7 @@ gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd" version="1.2">
   </graph>
 </gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__)
         obtained = '\n'.join(nx.generate_gexf(G))
-        assert_equal(expected, obtained)
+        assert expected == obtained
 
     def test_bool(self):
         G = nx.Graph()
@@ -469,7 +469,7 @@ gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd" version="1.2">
         nx.write_gexf(G, fh)
         fh.seek(0)
         H = nx.read_gexf(fh, node_type=int)
-        assert_equal(H.nodes[1]['testattr'], True)
+        assert H.nodes[1]['testattr'] == True
 
     # Test for NaN, INF and -INF
     def test_specials(self):
@@ -487,18 +487,18 @@ gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd" version="1.2">
         fh.seek(0)
         H = nx.read_gexf(fh, node_type=int)
 
-        assert_in(b'INF', filetext)
-        assert_in(b'NaN', filetext)
-        assert_in(b'-INF', filetext)
+        assert b'INF' in filetext
+        assert b'NaN' in filetext
+        assert b'-INF' in filetext
 
-        assert_equal(H.nodes[1]['testattr'], inf)
-        assert_true(isnan(H.nodes[2]['testattr']))
-        assert_equal(H.nodes[3]['testattr'], -inf)
+        assert H.nodes[1]['testattr'] == inf
+        assert isnan(H.nodes[2]['testattr'])
+        assert H.nodes[3]['testattr'] == -inf
 
-        assert_equal(H.nodes[1]['strdata'], 'inf')
-        assert_equal(H.nodes[2]['strdata'], 'nan')
-        assert_equal(H.nodes[3]['strdata'], '-inf')
+        assert H.nodes[1]['strdata'] == 'inf'
+        assert H.nodes[2]['strdata'] == 'nan'
+        assert H.nodes[3]['strdata'] == '-inf'
 
-        assert_equal(H.nodes[1]['networkx_key'], 'a')
-        assert_equal(H.nodes[2]['networkx_key'], 'b')
-        assert_equal(H.nodes[3]['networkx_key'], 'c')
+        assert H.nodes[1]['networkx_key'] == 'a'
+        assert H.nodes[2]['networkx_key'] == 'b'
+        assert H.nodes[3]['networkx_key'] == 'c'