From 11491404365ba925bb36935a9f7a14c1afe003cc Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 27 Nov 2012 00:44:17 +0100
Subject: Disable workaround for Jython scripts on Linux systems.

--HG--
branch : distribute
extra : rebase_source : 289980b084c335029d93732feb8e02da94472795
---
 setuptools/tests/test_resources.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'setuptools/tests/test_resources.py')

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index d08fa325..0bc1a095 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -561,6 +561,15 @@ class ScriptHeaderTests(TestCase):
         if (sys.version_info >= (3,) and os.environ.get("LC_CTYPE")
             in (None, "C", "POSIX")):
             return
+
+        class java:
+            class lang:
+                class System:
+                    @staticmethod
+                    def getProperty(property):
+                        return ""
+        sys.modules["java"] = java
+
         platform = sys.platform
         sys.platform = 'java1.5.0_13'
         stdout = sys.stdout
@@ -584,6 +593,7 @@ class ScriptHeaderTests(TestCase):
                              '#!%s -x\n' % self.non_ascii_exe)
             self.assertTrue('Unable to adapt shebang line' in sys.stdout.getvalue())
         finally:
+            del sys.modules["java"]
             sys.platform = platform
             sys.stdout = stdout
 
-- 
cgit v1.2.1


From b5cd47fbd96ae900dd835b68484084ab1219f260 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Feb 2013 02:13:45 -0500
Subject: Backed out changeset: d0a8d1a83053 In the discussion in #278, it
 became clear that the deviance in behavior from setuptools is problemmatic.
 For compatibility, defer to the setuptools version scheme as specifically
 intended.

--HG--
branch : distribute
extra : rebase_source : 1d5cc8c216f974b247e2dc84d8d40c868d6d3639
---
 setuptools/tests/test_resources.py | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'setuptools/tests/test_resources.py')

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 0bc1a095..292b78d1 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -477,13 +477,14 @@ class ParseTests(TestCase):
             p1, p2 = parse_version(s1),parse_version(s2)
             self.assertEqual(p1,p2, (s1,s2,p1,p2))
 
+        c('1.2-rc1', '1.2rc1')
         c('0.4', '0.4.0')
         c('0.4.0.0', '0.4.0')
         c('0.4.0-0', '0.4-0')
         c('0pl1', '0.0pl1')
         c('0pre1', '0.0c1')
         c('0.0.0preview1', '0c1')
-        c('0.0c1', '0rc1')
+        c('0.0c1', '0-rc1')
         c('1.2a1', '1.2.a.1'); c('1.2...a', '1.2a')
 
     def testVersionOrdering(self):
@@ -492,14 +493,11 @@ class ParseTests(TestCase):
             self.assertTrue(p1<p2, (s1,s2,p1,p2))
 
         c('2.1','2.1.1')
-        c('2.1.0','2.10')
         c('2a1','2b0')
-        c('2b1','2c0')
         c('2a1','2.1')
         c('2.3a1', '2.3')
         c('2.1-1', '2.1-2')
         c('2.1-1', '2.1.1')
-        c('2.1', '2.1.1-1')
         c('2.1', '2.1pl4')
         c('2.1a0-20040501', '2.1')
         c('1.1', '02.1')
@@ -510,20 +508,8 @@ class ParseTests(TestCase):
         c('0.4', '4.0')
         c('0.0.4', '0.4.0')
         c('0pl1', '0.4pl1')
+        c('2.1.0-rc1','2.1.0')
         c('2.1dev','2.1a0')
-        c('2.1.0rc1','2.1.0')
-        c('2.1.0','2.1.0-rc0')
-        c('2.1.0','2.1.0-a')
-        c('2.1.0','2.1.0-alpha')
-        c('2.1.0','2.1.0-foo')
-        c('1.0','1.0-1')
-        c('1.0-1','1.0.1')
-        c('1.0a','1.0b')
-        c('1.0dev','1.0rc1')
-        c('1.0pre','1.0')
-        c('1.0pre','1.0')
-        c('1.0a','1.0-a')
-        c('1.0rc1','1.0-rc1')
 
         torture ="""
         0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1
-- 
cgit v1.2.1