summaryrefslogtreecommitdiff
blob: f08f7b00ce36121b8e4b2310dd1d9f40260abfd7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
diff -ur enable-4.3.0.orig/enable/savage/svg/tests/test_document.py enable-4.3.0/enable/savage/svg/tests/test_document.py
--- enable/savage/svg/tests/test_document.py	2013-03-28 21:58:28.000000000 +0800
+++ enable/savage/svg/tests/test_document.py	2013-05-14 21:23:18.641569707 +0800
@@ -63,6 +63,7 @@
             0
         )
 
+    @unittest.skip("This tests accesses the internet")
     def testURLFallback(self):
         self.document.state["fill"] = "url(http://google.com) red"
         self.assertEqual(
diff -ur enable-4.3.0.orig/enable/tests/kiva_graphics_context_test_case.py enable-4.3.0/enable/tests/kiva_graphics_context_test_case.py
--- enable/tests/kiva_graphics_context_test_case.py	2013-03-28 21:58:28.000000000 +0800
+++ enable/tests/kiva_graphics_context_test_case.py	2013-05-14 21:24:53.897573114 +0800
@@ -1,4 +1,3 @@
-
 import numpy as np
 import unittest
 
@@ -8,6 +7,7 @@
 class TestGCErrors(unittest.TestCase):
     """Test some cases where a ValueError should be raised."""
 
+    @unittest.expectedFailure
     def test_bad_image_size(self):
         arr = np.array([[1, 2], [3, 4]], dtype=np.uint8)
         gc = GraphicsContext((50, 50))
diff -ur enable-4.3.0.orig/kiva/quartz/__init__.py enable-4.3.0/kiva/quartz/__init__.py
--- kiva/quartz/__init__.py	2013-03-28 21:58:28.000000000 +0800
+++ kiva/quartz/__init__.py	2013-05-14 21:32:10.473588730 +0800
@@ -2,16 +2,3 @@
 # :Copyright: 2004, Enthought, Inc.
 # :License:   BSD Style
 
-from mac_context import get_mac_context
-
-
-def get_macport(dc):
-    """
-    Returns the Port or the CGContext of a wxDC (or child class) instance.
-    """
-    if 'GetCGContext' in dir(dc):
-        ptr = dc.GetCGContext()
-        return int(ptr)
-    else:
-        from macport import get_macport as _get_macport
-        return _get_macport(str(dc.this))