libs/twisted/patches/001-dont_use_zope.patch

   1 --- Twisted-2.5.0/TwistedCore-2.5.0/setup.py    2006-12-22 23:02:47.000000000 -0600
   2 +++ Twisted-2.5.0.new/TwistedCore-2.5.0/setup.py        2007-05-14 16:13:36.095282000 -0500
   3 @@ -16,9 +16,8 @@
   4  from distutils.core import Extension
   5
   6  if os.path.exists('twisted'):
   7 -    sys.path.insert(0, '.') # eek! need this to import twisted. sorry.
   8 -from twisted import copyright
   9 -from twisted.python import dist, util
  10 +    sys.path.insert(0, 'twisted/python') # eek! need this to import twisted. sorry.
  11 +import dist
  12
  13  def detectExtensions(builder):
  14      """
  15 @@ -72,7 +71,7 @@
  16  setup_args = dict(
  17      # metadata
  18      name="Twisted",
  19 -    version=copyright.version,
  20 +    version="2.5.0",
  21      description="An asynchronous networking framework written in Python",
  22      author="Twisted Matrix Laboratories",
  23      author_email="twisted-python@twistedmatrix.com",
  24 --- Twisted-2.5.0/TwistedWords-0.5.0/setup.py   2006-05-13 14:26:09.000000000 -0500
  25 +++ Twisted-2.5.0.new/TwistedWords-0.5.0/setup.py       2007-05-14 16:24:39.860764750 -0500
  26 @@ -1,7 +1,8 @@
  27  import sys
  28 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
  29
  30  try:
  31 -    from twisted.python import dist
  32 +    import dist
  33  except ImportError:
  34      raise SystemExit("twisted.python.dist module not found.  Make sure you "
  35                       "have installed the Twisted core package before "
  36 --- Twisted-2.5.0/TwistedCore-2.5.0/twisted/python/dist.py      2006-10-01 14:16:04.000000000 -0500
  37 +++ Twisted-2.5.0.new//TwistedCore-2.5.0/twisted/python/dist.py 2007-05-14 16:50:07.952264500 -0500
  38 @@ -85,12 +85,25 @@
  39      "2.0.0".
  40      """
  41      if proj == 'core':
  42 -        vfile = os.path.join(base, '_version.py')
  43 +        return '2.5.0'
  44 +    elif proj == 'words':
  45 +        return '0.7.0'
  46 +    elif proj == 'conch':
  47 +        return '0.8.0'
  48 +    elif proj == 'lore':
  49 +        return '0.3.0'
  50 +    elif proj == 'mail':
  51 +        return '0.4.0'
  52 +    elif proj == 'names':
  53 +        return '0.4.0'
  54 +    elif proj == 'news':
  55 +        return '0.3.0'
  56 +    elif proj == 'runner':
  57 +        return '0.2.0'
  58 +    elif proj == 'web':
  59 +        return '0.7.0'
  60      else:
  61 -        vfile = os.path.join(base, proj, '_version.py')
  62 -    ns = {'__name__': 'Nothing to see here'}
  63 -    execfile(vfile, ns)
  64 -    return ns['version'].base()
  65 +        return False
  66
  67
  68  # Names that are exluded from globbing results:
  69 --- Twisted-2.5.0/TwistedConch-0.8.0/setup.py   2006-05-13 14:26:09.000000000 -0500
  70 +++ Twisted-2.5.0.new//TwistedConch-0.8.0/setup.py      2007-05-14 17:00:05.501609000 -0500
  71 @@ -1,7 +1,8 @@
  72  import sys
  73 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
  74
  75  try:
  76 -    from twisted.python import dist
  77 +    import dist
  78  except ImportError:
  79      raise SystemExit("twisted.python.dist module not found.  Make sure you "
  80                       "have installed the Twisted core package before "
  81 --- Twisted-2.5.0/TwistedLore-0.3.0/setup.py    2006-05-13 14:26:09.000000000 -0500
  82 +++ Twisted-2.5.0.new/TwistedLore-0.3.0/setup.py        2007-05-14 17:17:25.374597000 -0500
  83 @@ -1,7 +1,8 @@
  84  import sys
  85 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
  86
  87  try:
  88 -    from twisted.python import dist
  89 +    import dist
  90  except ImportError:
  91      raise SystemExit("twisted.python.dist module not found.  Make sure you "
  92                       "have installed the Twisted core package before "
  93 --- Twisted-2.5.0/TwistedMail-0.4.0/setup.py    2006-05-13 14:26:09.000000000 -0500
  94 +++ Twisted-2.5.0.new/TwistedMail-0.4.0/setup.py        2007-05-14 17:18:02.544920000 -0500
  95 @@ -1,7 +1,10 @@
  96  import sys
  97 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
  98 +
  99
 100  try:
 101 -    from twisted.python import dist
 102 +    import dist
 103 +
 104  except ImportError:
 105      raise SystemExit("twisted.python.dist module not found.  Make sure you "
 106                       "have installed the Twisted core package before "
 107 --- Twisted-2.5.0/TwistedNames-0.4.0/setup.py   2006-05-13 14:26:09.000000000 -0500
 108 +++ Twisted-2.5.0.new/TwistedNames-0.4.0/setup.py       2007-05-14 17:18:37.707117500 -0500
 109 @@ -1,7 +1,10 @@
 110  import sys
 111 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
 112 +
 113
 114  try:
 115 -    from twisted.python import dist
 116 +    import dist
 117 +
 118  except ImportError:
 119      raise SystemExit("twisted.python.dist module not found.  Make sure you "
 120                       "have installed the Twisted core package before "
 121 --- Twisted-2.5.0/TwistedNews-0.3.0/setup.py    2006-05-13 14:26:09.000000000 -0500
 122 +++ Twisted-2.5.0.new/TwistedNews-0.3.0/setup.py        2007-05-14 17:19:16.769558750 -0500
 123 @@ -1,6 +1,9 @@
 124 +import sys
 125 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
 126
 127  try:
 128 -    from twisted.python import dist
 129 +    import dist
 130 +
 131  except ImportError:
 132      raise SystemExit("twisted.python.dist module not found.  Make sure you "
 133                       "have installed the Twisted core package before "
 134 --- Twisted-2.5.0/TwistedRunner-0.2.0/setup.py  2006-05-13 14:26:09.000000000 -0500
 135 +++ Twisted-2.5.0.new/TwistedRunner-0.2.0/setup.py      2007-05-14 17:20:54.367658250 -0500
 136 @@ -1,8 +1,11 @@
 137 +import sys
 138 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
 139
 140  from distutils.core import Extension
 141
 142  try:
 143 -    from twisted.python import dist
 144 +    import dist
 145 +
 146  except ImportError:
 147      raise SystemExit("twisted.python.dist module not found.  Make sure you "
 148                       "have installed the Twisted core package before "
 149 --- Twisted-2.5.0/TwistedWeb-0.7.0/setup.py     2006-05-13 14:26:09.000000000 -0500
 150 +++ Twisted-2.5.0.new/TwistedWeb-0.7.0/setup.py 2007-05-14 17:21:21.065326750 -0500
 151 @@ -1,7 +1,10 @@
 152  import sys
 153 +sys.path.append('../TwistedCore-2.5.0/twisted/python')
 154 +
 155
 156  try:
 157 -    from twisted.python import dist
 158 +    import dist
 159 +
 160  except ImportError:
 161      raise SystemExit("twisted.python.dist module not found.  Make sure you "
 162                       "have installed the Twisted core package before "