Changeset 2919

Show
Ignore:
Timestamp:
06/06/06 00:08:49 (17 years ago)
Author:
jerome
Message:

Added support for pkipplib v0.06

Location:
pykota/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • pykota/trunk/bin/cupspykota

    r2918 r2919  
    286286        if haspkipplib : 
    287287            self.ControlFile = "NotUsedAnymore" 
    288             cupsurl = "http://%s:%s" % \ 
    289                                (os.environ.get("CUPS_SERVER") or "localhost", \ 
    290                                 os.environ.get("IPP_PORT", "631")) 
    291             self.logdebug("Querying CUPS server at %s" % cupsurl)                     
    292             cupsserver = pkipplib.CUPS(url=cupsurl) # TODO : username and password 
     288            self.logdebug("Querying CUPS server...") 
     289            cupsserver = pkipplib.CUPS() # TODO : username and password and/or encryption 
    293290            answer = cupsserver.getJobAttributes(self.JobId) 
    294291            if answer is None : 
    295                 self.printInfo(_("Network error while querying the CUPS server at %s (maybe incorrect authentication)") \ 
    296                                           % cupsurl, "error") 
     292                self.printInfo(_("Network error while querying the CUPS server : %s") \ 
     293                                          % cupsserver.lastErrorMessage, "error") 
    297294                connerror = True                         
    298295            else :     
    299                 self.logdebug("CUPS server at %s answered without error." % cupsurl) 
     296                self.logdebug("CUPS server answered without error.") 
    300297                try : 
    301298                    john = answer.job["job-originating-host-name"] 
  • pykota/trunk/pykota/version.py

    r2904 r2919  
    2222# 
    2323 
    24 __version__ = "1.25alpha5_unofficial" 
     24__version__ = "1.25alpha6_unofficial" 
    2525 
    2626__doc__ = "PyKota : a complete Printing Quota Solution for CUPS."