[Spambayes-checkins] spambayes/Outlook2000 export.py,1.7,1.8

[Tim Peters]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1:/tmp/cvs-serv11978

Modified Files:
	export.py 
Log Message:
Made module-global data names uppercase.


Index: export.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/export.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** export.py	25 Dec 2003 18:34:10 -0000	1.7
--- export.py	25 Dec 2003 18:40:22 -0000	1.8
***************
*** 4,9 ****
  from manager import GetManager
  
! files_per_directory = 400
! default_directory = "..\\testtools\\Data"
  
  def BuildBuckets(manager):
--- 4,9 ----
  from manager import GetManager
  
! FILES_PER_DIRECTORY = 400
! DEFAULT_DIRECTORY = "..\\testtools\\Data"
  
  def BuildBuckets(manager):
***************
*** 17,21 ****
          for msg in folder.GetMessageGenerator():
              num_ham += 1
!     num_buckets = min(num_ham, num_spam)/ files_per_directory
      dirs = []
      for i in range(num_buckets):
--- 17,21 ----
          for msg in folder.GetMessageGenerator():
              num_ham += 1
!     num_buckets = min(num_ham, num_spam)/ FILES_PER_DIRECTORY
      dirs = []
      for i in range(num_buckets):
***************
*** 79,84 ****
  
  def main():
      import getopt
!     try:
          opts, args = getopt.getopt(sys.argv[1:], "qn:")
      except getopt.error, d:
--- 79,86 ----
  
  def main():
+     global FILES_PER_DIRECTORY
      import getopt
! 
!    try:
          opts, args = getopt.getopt(sys.argv[1:], "qn:")
      except getopt.error, d:
***************
*** 91,96 ****
              quiet = 1
          elif opt=='-n':
!             global files_per_directory
!             files_per_directory = int(val)
  
      if len(args) > 1:
--- 93,97 ----
              quiet = 1
          elif opt=='-n':
!             FILES_PER_DIRECTORY = int(val)
  
      if len(args) > 1:
***************
*** 100,104 ****
  
      if len(args)==0:
!         directory = os.path.join(os.path.dirname(sys.argv[0]), default_directory)
      else:
          directory = args[0]
--- 101,105 ----
  
      if len(args)==0:
!         directory = os.path.join(os.path.dirname(sys.argv[0]), DEFAULT_DIRECTORY)
      else:
          directory = args[0]
***************
*** 130,134 ****
  If 'directory' exists, it will be recursively deleted before
  the export (but you will be asked to confirm unless -q is given).""" \
!             % (os.path.basename(sys.argv[0]), files_per_directory, default_directory)
      sys.exit(1)
  
--- 131,135 ----
  If 'directory' exists, it will be recursively deleted before
  the export (but you will be asked to confirm unless -q is given).""" \
!             % (os.path.basename(sys.argv[0]), FILES_PER_DIRECTORY, DEFAULT_DIRECTORY)
      sys.exit(1)