Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 1 | """distutils.command.register |
| 2 | |
| 3 | Implements the Distutils 'register' command (register with the repository). |
| 4 | """ |
| 5 | |
| 6 | # created 2002/10/21, Richard Jones |
| 7 | |
| 8 | __revision__ = "$Id$" |
| 9 | |
Jeremy Hylton | 1afc169 | 2008-06-18 20:49:58 +0000 | [diff] [blame] | 10 | import os, string, getpass |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 11 | import io |
Jeremy Hylton | 1afc169 | 2008-06-18 20:49:58 +0000 | [diff] [blame] | 12 | import urllib.parse, urllib.request |
Tarek Ziadé | 5af55c6 | 2009-05-16 16:52:13 +0000 | [diff] [blame] | 13 | from warnings import warn |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 14 | |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 15 | from distutils.core import PyPIRCCommand |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 16 | from distutils.errors import * |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 17 | from distutils import log |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 18 | |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 19 | class register(PyPIRCCommand): |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 20 | |
Andrew M. Kuchling | a9ccce3 | 2003-03-03 18:26:01 +0000 | [diff] [blame] | 21 | description = ("register the distribution with the Python package index") |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 22 | user_options = PyPIRCCommand.user_options + [ |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 23 | ('list-classifiers', None, |
| 24 | 'list the valid Trove classifiers'), |
Tarek Ziadé | 5af55c6 | 2009-05-16 16:52:13 +0000 | [diff] [blame] | 25 | ('strict', None , |
| 26 | 'Will stop the registering if the meta-data are not fully compliant') |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 27 | ] |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 28 | boolean_options = PyPIRCCommand.boolean_options + [ |
Tarek Ziadé | 5af55c6 | 2009-05-16 16:52:13 +0000 | [diff] [blame] | 29 | 'verify', 'list-classifiers', 'strict'] |
| 30 | |
| 31 | sub_commands = [('check', lambda self: True)] |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 32 | |
| 33 | def initialize_options(self): |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 34 | PyPIRCCommand.initialize_options(self) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 35 | self.list_classifiers = 0 |
Tarek Ziadé | 5af55c6 | 2009-05-16 16:52:13 +0000 | [diff] [blame] | 36 | self.strict = 0 |
| 37 | |
| 38 | def finalize_options(self): |
| 39 | PyPIRCCommand.finalize_options(self) |
| 40 | # setting options for the `check` subcommand |
| 41 | check_options = {'strict': ('register', self.strict), |
| 42 | 'restructuredtext': ('register', 1)} |
| 43 | self.distribution.command_options['check'] = check_options |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 44 | |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 45 | def run(self): |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 46 | self.finalize_options() |
| 47 | self._set_config() |
Tarek Ziadé | 5af55c6 | 2009-05-16 16:52:13 +0000 | [diff] [blame] | 48 | |
| 49 | # Run sub commands |
| 50 | for cmd_name in self.get_sub_commands(): |
| 51 | self.run_command(cmd_name) |
| 52 | |
Andrew M. Kuchling | 058a84f | 2003-04-09 12:35:51 +0000 | [diff] [blame] | 53 | if self.dry_run: |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 54 | self.verify_metadata() |
| 55 | elif self.list_classifiers: |
| 56 | self.classifiers() |
| 57 | else: |
| 58 | self.send_metadata() |
| 59 | |
| 60 | def check_metadata(self): |
Tarek Ziadé | 5af55c6 | 2009-05-16 16:52:13 +0000 | [diff] [blame] | 61 | """Deprecated API.""" |
| 62 | warn("distutils.command.register.check_metadata is deprecated, \ |
| 63 | use the check command instead", PendingDeprecationWarning) |
| 64 | check = self.distribution.get_command_obj('check') |
| 65 | check.ensure_finalized() |
| 66 | check.strict = self.strict |
| 67 | check.restructuredtext = 1 |
| 68 | check.run() |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 69 | |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 70 | def _set_config(self): |
| 71 | ''' Reads the configuration file and set attributes. |
| 72 | ''' |
| 73 | config = self._read_pypirc() |
| 74 | if config != {}: |
| 75 | self.username = config['username'] |
| 76 | self.password = config['password'] |
| 77 | self.repository = config['repository'] |
| 78 | self.realm = config['realm'] |
| 79 | self.has_config = True |
| 80 | else: |
| 81 | if self.repository not in ('pypi', self.DEFAULT_REPOSITORY): |
| 82 | raise ValueError('%s not found in .pypirc' % self.repository) |
| 83 | if self.repository == 'pypi': |
| 84 | self.repository = self.DEFAULT_REPOSITORY |
| 85 | self.has_config = False |
| 86 | |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 87 | def classifiers(self): |
| 88 | ''' Fetch the list of classifiers from the server. |
| 89 | ''' |
Jeremy Hylton | 1afc169 | 2008-06-18 20:49:58 +0000 | [diff] [blame] | 90 | url = self.repository+'?:action=list_classifiers' |
| 91 | response = urllib.request.urlopen(url) |
Tarek Ziadé | baf5180 | 2009-03-31 21:37:16 +0000 | [diff] [blame] | 92 | log.info(response.read()) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 93 | |
| 94 | def verify_metadata(self): |
| 95 | ''' Send the metadata to the package index server to be checked. |
| 96 | ''' |
| 97 | # send the info to the server and report the result |
| 98 | (code, result) = self.post_to_server(self.build_post_data('verify')) |
Tarek Ziadé | baf5180 | 2009-03-31 21:37:16 +0000 | [diff] [blame] | 99 | log.info('Server response (%s): %s' % (code, result)) |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 100 | |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 101 | def send_metadata(self): |
| 102 | ''' Send the metadata to the package index server. |
| 103 | |
| 104 | Well, do the following: |
| 105 | 1. figure who the user is, and then |
| 106 | 2. send the data as a Basic auth'ed POST. |
| 107 | |
| 108 | First we try to read the username/password from $HOME/.pypirc, |
| 109 | which is a ConfigParser-formatted file with a section |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 110 | [distutils] containing username and password entries (both |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 111 | in clear text). Eg: |
| 112 | |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 113 | [distutils] |
| 114 | index-servers = |
| 115 | pypi |
| 116 | |
| 117 | [pypi] |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 118 | username: fred |
| 119 | password: sekrit |
| 120 | |
| 121 | Otherwise, to figure who the user is, we offer the user three |
| 122 | choices: |
| 123 | |
| 124 | 1. use existing login, |
| 125 | 2. register as a new user, or |
| 126 | 3. set the password to a random string and email the user. |
| 127 | |
| 128 | ''' |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 129 | # see if we can short-cut and get the username/password from the |
| 130 | # config |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 131 | if self.has_config: |
| 132 | choice = '1' |
| 133 | username = self.username |
| 134 | password = self.password |
| 135 | else: |
| 136 | choice = 'x' |
| 137 | username = password = '' |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 138 | |
| 139 | # get the user's login info |
| 140 | choices = '1 2 3 4'.split() |
| 141 | while choice not in choices: |
Benjamin Peterson | 9203501 | 2008-12-27 16:00:54 +0000 | [diff] [blame] | 142 | self.announce('''\ |
| 143 | We need to know who you are, so please choose either: |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 144 | 1. use your existing login, |
| 145 | 2. register as a new user, |
| 146 | 3. have the server generate a new password for you (and email it to you), or |
| 147 | 4. quit |
Benjamin Peterson | 9203501 | 2008-12-27 16:00:54 +0000 | [diff] [blame] | 148 | Your selection [default 1]: ''', log.INFO) |
Benjamin Peterson | 467a7bd | 2008-12-27 17:00:44 +0000 | [diff] [blame] | 149 | choice = input() |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 150 | if not choice: |
| 151 | choice = '1' |
| 152 | elif choice not in choices: |
Guido van Rossum | be19ed7 | 2007-02-09 05:37:30 +0000 | [diff] [blame] | 153 | print('Please choose one of the four options!') |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 154 | |
| 155 | if choice == '1': |
| 156 | # get the username and password |
| 157 | while not username: |
Martin v. Löwis | 2d1ca2d | 2008-11-20 16:21:55 +0000 | [diff] [blame] | 158 | username = input('Username: ') |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 159 | while not password: |
| 160 | password = getpass.getpass('Password: ') |
| 161 | |
| 162 | # set up the authentication |
Jeremy Hylton | 1afc169 | 2008-06-18 20:49:58 +0000 | [diff] [blame] | 163 | auth = urllib.request.HTTPPasswordMgr() |
| 164 | host = urllib.parse.urlparse(self.repository)[1] |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 165 | auth.add_password(self.realm, host, username, password) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 166 | # send the info to the server and report the result |
| 167 | code, result = self.post_to_server(self.build_post_data('submit'), |
| 168 | auth) |
Benjamin Peterson | 9203501 | 2008-12-27 16:00:54 +0000 | [diff] [blame] | 169 | self.announce('Server response (%s): %s' % (code, result), |
| 170 | log.INFO) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 171 | |
| 172 | # possibly save the login |
Tarek Ziadé | 13f7c3b | 2009-01-09 00:15:45 +0000 | [diff] [blame] | 173 | if code == 200: |
| 174 | if self.has_config: |
| 175 | # sharing the password in the distribution instance |
| 176 | # so the upload command can reuse it |
| 177 | self.distribution.password = password |
| 178 | else: |
| 179 | self.announce(('I can store your PyPI login so future ' |
| 180 | 'submissions will be faster.'), log.INFO) |
| 181 | self.announce('(the login will be stored in %s)' % \ |
| 182 | self._get_rc_file(), log.INFO) |
| 183 | choice = 'X' |
| 184 | while choice.lower() not in 'yn': |
| 185 | choice = input('Save your login (y/N)?') |
| 186 | if not choice: |
| 187 | choice = 'n' |
| 188 | if choice.lower() == 'y': |
| 189 | self._store_pypirc(username, password) |
Alexandre Vassalotti | 5f8ced2 | 2008-05-16 00:03:33 +0000 | [diff] [blame] | 190 | |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 191 | elif choice == '2': |
| 192 | data = {':action': 'user'} |
| 193 | data['name'] = data['password'] = data['email'] = '' |
| 194 | data['confirm'] = None |
| 195 | while not data['name']: |
Martin v. Löwis | 2d1ca2d | 2008-11-20 16:21:55 +0000 | [diff] [blame] | 196 | data['name'] = input('Username: ') |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 197 | while data['password'] != data['confirm']: |
| 198 | while not data['password']: |
| 199 | data['password'] = getpass.getpass('Password: ') |
| 200 | while not data['confirm']: |
| 201 | data['confirm'] = getpass.getpass(' Confirm: ') |
| 202 | if data['password'] != data['confirm']: |
| 203 | data['password'] = '' |
| 204 | data['confirm'] = None |
Guido van Rossum | be19ed7 | 2007-02-09 05:37:30 +0000 | [diff] [blame] | 205 | print("Password and confirm don't match!") |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 206 | while not data['email']: |
Martin v. Löwis | 2d1ca2d | 2008-11-20 16:21:55 +0000 | [diff] [blame] | 207 | data['email'] = input(' EMail: ') |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 208 | code, result = self.post_to_server(data) |
| 209 | if code != 200: |
Tarek Ziadé | baf5180 | 2009-03-31 21:37:16 +0000 | [diff] [blame] | 210 | log.info('Server response (%s): %s' % (code, result)) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 211 | else: |
Tarek Ziadé | baf5180 | 2009-03-31 21:37:16 +0000 | [diff] [blame] | 212 | log.info('You will receive an email shortly.') |
| 213 | log.info(('Follow the instructions in it to ' |
| 214 | 'complete registration.')) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 215 | elif choice == '3': |
| 216 | data = {':action': 'password_reset'} |
| 217 | data['email'] = '' |
| 218 | while not data['email']: |
Martin v. Löwis | 2d1ca2d | 2008-11-20 16:21:55 +0000 | [diff] [blame] | 219 | data['email'] = input('Your email address: ') |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 220 | code, result = self.post_to_server(data) |
Tarek Ziadé | baf5180 | 2009-03-31 21:37:16 +0000 | [diff] [blame] | 221 | log.info('Server response (%s): %s' % (code, result)) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 222 | |
| 223 | def build_post_data(self, action): |
| 224 | # figure the data to send - the metadata plus some additional |
| 225 | # information used by the package server |
| 226 | meta = self.distribution.metadata |
| 227 | data = { |
| 228 | ':action': action, |
| 229 | 'metadata_version' : '1.0', |
| 230 | 'name': meta.get_name(), |
| 231 | 'version': meta.get_version(), |
| 232 | 'summary': meta.get_description(), |
| 233 | 'home_page': meta.get_url(), |
| 234 | 'author': meta.get_contact(), |
| 235 | 'author_email': meta.get_contact_email(), |
| 236 | 'license': meta.get_licence(), |
| 237 | 'description': meta.get_long_description(), |
| 238 | 'keywords': meta.get_keywords(), |
| 239 | 'platform': meta.get_platforms(), |
Andrew M. Kuchling | 23c98c5 | 2003-02-19 13:49:35 +0000 | [diff] [blame] | 240 | 'classifiers': meta.get_classifiers(), |
Andrew M. Kuchling | 80be59b | 2003-02-19 14:27:21 +0000 | [diff] [blame] | 241 | 'download_url': meta.get_download_url(), |
Fred Drake | db7b002 | 2005-03-20 22:19:47 +0000 | [diff] [blame] | 242 | # PEP 314 |
| 243 | 'provides': meta.get_provides(), |
| 244 | 'requires': meta.get_requires(), |
| 245 | 'obsoletes': meta.get_obsoletes(), |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 246 | } |
Fred Drake | db7b002 | 2005-03-20 22:19:47 +0000 | [diff] [blame] | 247 | if data['provides'] or data['requires'] or data['obsoletes']: |
| 248 | data['metadata_version'] = '1.1' |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 249 | return data |
| 250 | |
| 251 | def post_to_server(self, data, auth=None): |
| 252 | ''' Post a query to the server, and return a string response. |
| 253 | ''' |
Tarek Ziadé | baf5180 | 2009-03-31 21:37:16 +0000 | [diff] [blame] | 254 | if 'name' in data: |
| 255 | self.announce('Registering %s to %s' % (data['name'], |
| 256 | self.repository), |
| 257 | log.INFO) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 258 | # Build up the MIME payload for the urllib2 POST data |
| 259 | boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254' |
| 260 | sep_boundary = '\n--' + boundary |
| 261 | end_boundary = sep_boundary + '--' |
Guido van Rossum | 34d1928 | 2007-08-09 01:03:29 +0000 | [diff] [blame] | 262 | body = io.StringIO() |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 263 | for key, value in data.items(): |
| 264 | # handle multiple entries for the same name |
Thomas Wouters | 89f507f | 2006-12-13 04:49:30 +0000 | [diff] [blame] | 265 | if type(value) not in (type([]), type( () )): |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 266 | value = [value] |
| 267 | for value in value: |
Martin v. Löwis | 2d1ca2d | 2008-11-20 16:21:55 +0000 | [diff] [blame] | 268 | value = str(value) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 269 | body.write(sep_boundary) |
| 270 | body.write('\nContent-Disposition: form-data; name="%s"'%key) |
| 271 | body.write("\n\n") |
| 272 | body.write(value) |
| 273 | if value and value[-1] == '\r': |
| 274 | body.write('\n') # write an extra newline (lurve Macs) |
| 275 | body.write(end_boundary) |
| 276 | body.write("\n") |
Martin v. Löwis | 2d1ca2d | 2008-11-20 16:21:55 +0000 | [diff] [blame] | 277 | body = body.getvalue().encode("utf-8") |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 278 | |
| 279 | # build the Request |
| 280 | headers = { |
Walter Dörwald | a6e8a4a | 2005-03-31 13:57:38 +0000 | [diff] [blame] | 281 | 'Content-type': 'multipart/form-data; boundary=%s; charset=utf-8'%boundary, |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 282 | 'Content-length': str(len(body)) |
| 283 | } |
Jeremy Hylton | 1afc169 | 2008-06-18 20:49:58 +0000 | [diff] [blame] | 284 | req = urllib.request.Request(self.repository, body, headers) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 285 | |
| 286 | # handle HTTP and include the Basic Auth handler |
Jeremy Hylton | 1afc169 | 2008-06-18 20:49:58 +0000 | [diff] [blame] | 287 | opener = urllib.request.build_opener( |
| 288 | urllib.request.HTTPBasicAuthHandler(password_mgr=auth) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 289 | ) |
| 290 | data = '' |
| 291 | try: |
| 292 | result = opener.open(req) |
Jeremy Hylton | 1afc169 | 2008-06-18 20:49:58 +0000 | [diff] [blame] | 293 | except urllib.error.HTTPError as e: |
Andrew M. Kuchling | 23c98c5 | 2003-02-19 13:49:35 +0000 | [diff] [blame] | 294 | if self.show_response: |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 295 | data = e.fp.read() |
| 296 | result = e.code, e.msg |
Jeremy Hylton | 1afc169 | 2008-06-18 20:49:58 +0000 | [diff] [blame] | 297 | except urllib.error.URLError as e: |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 298 | result = 500, str(e) |
| 299 | else: |
Andrew M. Kuchling | 23c98c5 | 2003-02-19 13:49:35 +0000 | [diff] [blame] | 300 | if self.show_response: |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 301 | data = result.read() |
| 302 | result = 200, 'OK' |
Andrew M. Kuchling | 23c98c5 | 2003-02-19 13:49:35 +0000 | [diff] [blame] | 303 | if self.show_response: |
Tarek Ziadé | baf5180 | 2009-03-31 21:37:16 +0000 | [diff] [blame] | 304 | dashes = '-' * 75 |
| 305 | self.announce('%s%s%s' % (dashes, data, dashes)) |
Andrew M. Kuchling | 51a6a4c | 2003-01-03 15:29:28 +0000 | [diff] [blame] | 306 | return result |