[Python-checkins] python/dist/src/Lib/distutils/command register.py,1.2,1.3

[akuchling@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory sc8-pr-cvs1:/tmp/cvs-serv4351

Modified Files:
	register.py 
Log Message:
[Patch #684398] Rename verbose argument to show-response; don't conditionalize the get_classifiers() call

Index: register.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/register.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** register.py	18 Feb 2003 21:28:20 -0000	1.2
--- register.py	19 Feb 2003 13:49:35 -0000	1.3
***************
*** 27,39 ****
          ('list-classifiers', None,
           'list the valid Trove classifiers'),
!         ('verbose', None,
!          'display full response from server'),
          ]
!     boolean_options = ['verify', 'verbose', 'list-classifiers']
  
      def initialize_options(self):
          self.repository = None
          self.verify = 0
!         self.verbose = 0
          self.list_classifiers = 0
  
--- 27,39 ----
          ('list-classifiers', None,
           'list the valid Trove classifiers'),
!         ('show-response', None,
!          'display full response text from server'),
          ]
!     boolean_options = ['verify', 'show-response', 'list-classifiers']
  
      def initialize_options(self):
          self.repository = None
          self.verify = 0
!         self.show_response = 0
          self.list_classifiers = 0
  
***************
*** 233,239 ****
              'keywords': meta.get_keywords(),
              'platform': meta.get_platforms(),
          }
-         if hasattr(meta, 'classifiers'):
-             data['classifiers'] = meta.get_classifiers()
          return data
  
--- 233,238 ----
              'keywords': meta.get_keywords(),
              'platform': meta.get_platforms(),
+             'classifiers': meta.get_classifiers(),
          }
          return data
  
***************
*** 278,282 ****
              result = opener.open(req)
          except urllib2.HTTPError, e:
!             if self.verbose:
                  data = e.fp.read()
              result = e.code, e.msg
--- 277,281 ----
              result = opener.open(req)
          except urllib2.HTTPError, e:
!             if self.show_response:
                  data = e.fp.read()
              result = e.code, e.msg
***************
*** 284,291 ****
              result = 500, str(e)
          else:
!             if self.verbose:
                  data = result.read()
              result = 200, 'OK'
!         if self.verbose:
              print '-'*75, data, '-'*75
          return result
--- 283,290 ----
              result = 500, str(e)
          else:
!             if self.show_response:
                  data = result.read()
              result = 200, 'OK'
!         if self.show_response:
              print '-'*75, data, '-'*75
          return result