diff --git a/php.py b/php.py deleted file mode 100644 index 524d95223..000000000 --- a/php.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/python -# -*- coding: latin-1 -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by the -# Free Software Foundation; either version 3, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. - -"Módulo con funciones y objetos para compatibilidad con PHP" - -__author__ = "Mariano Reingart (mariano@nsis.com.ar)" -__copyright__ = "Copyright (C) 2008 Mariano Reingart" -__license__ = "LGPL 3.0" -__version__ = "1.0" - -import datetime, sys, time -import xml.dom.minidom -import httplib2 -from soap import SoapFault, SoapClient, parse_proxy, SimpleXMLElement - -def date(fmt=None,timestamp=None): - "Manejo de fechas (simil PHP)" - if fmt=='U': # return timestamp - t = datetime.datetime.now() - return int(time.mktime(t.timetuple())) - if fmt=='c': # return isoformat - d = datetime.datetime.fromtimestamp(timestamp) - return d.isoformat() - if fmt=='Ymd': - d = datetime.datetime.now() - return d.strftime("%Y%m%d") - - diff --git a/pyrece.py b/pyrece.py index 2763d127a..89883710a 100644 --- a/pyrece.py +++ b/pyrece.py @@ -27,7 +27,7 @@ import traceback from ConfigParser import SafeConfigParser import wsaa, wsfe, wsfev1, wsfexv1 -from php import SimpleXMLElement, SoapClient, SoapFault, date +from utils import SimpleXMLElement, SoapClient, SoapFault, date from email.mime.text import MIMEText from email.mime.application import MIMEApplication from email.mime.multipart import MIMEMultipart diff --git a/rece1.py b/rece1.py index 8fb56b3cf..21567f112 100644 --- a/rece1.py +++ b/rece1.py @@ -26,7 +26,7 @@ # revisar la instalación de pyafip.ws: import wsfev1 -from php import SimpleXMLElement, SoapClient, SoapFault, date +from utils import SimpleXMLElement, SoapClient, SoapFault, date from utils import leer, escribir, leer_dbf, guardar_dbf, N, A, I, abrir_conf diff --git a/recem.py b/recem.py index 10e801c6e..29a11c769 100644 --- a/recem.py +++ b/recem.py @@ -25,7 +25,7 @@ # revisar la instalación de pyafip.ws: import wsmtx -from php import SimpleXMLElement, SoapClient, SoapFault, date +from utils import SimpleXMLElement, SoapClient, SoapFault, date from utils import leer, escribir, leer_dbf, guardar_dbf, N, A, I, abrir_conf diff --git a/recex1.py b/recex1.py index 8d24220d7..af90017b6 100644 --- a/recex1.py +++ b/recex1.py @@ -25,7 +25,7 @@ # revisar la instalación de pyafip.ws: import wsfexv1 -from php import SimpleXMLElement, SoapClient, SoapFault, date +from utils import SimpleXMLElement, SoapClient, SoapFault, date from utils import leer, escribir, leer_dbf, guardar_dbf, N, A, I, abrir_conf diff --git a/utils.py b/utils.py index 9992ec112..66c6a6921 100644 --- a/utils.py +++ b/utils.py @@ -16,6 +16,7 @@ __copyright__ = "Copyright (C) 2013 Mariano Reingart" __license__ = "GPL 3.0" +import datetime import functools import inspect import locale @@ -23,6 +24,7 @@ import sys import os import stat +import time import traceback import warnings from cStringIO import StringIO @@ -840,6 +842,19 @@ def norm(x, encoding="latin1"): return unicodedata.normalize('NFKD', x).encode('ASCII', 'ignore') +def date(fmt=None,timestamp=None): + "Manejo de fechas (simil PHP)" + if fmt=='U': # return timestamp + t = datetime.datetime.now() + return int(time.mktime(t.timetuple())) + if fmt=='c': # return isoformat + d = datetime.datetime.fromtimestamp(timestamp) + return d.isoformat() + if fmt=='Ymd': + d = datetime.datetime.now() + return d.strftime("%Y%m%d") + + def get_install_dir(): if not hasattr(sys, "frozen"): basepath = __file__ diff --git a/wdigdepfiel.py b/wdigdepfiel.py index c1a77247e..9d3d79639 100644 --- a/wdigdepfiel.py +++ b/wdigdepfiel.py @@ -31,7 +31,7 @@ """ import os, sys, time -from php import date, SimpleXMLElement, SoapClient, SoapFault +from utils import date, SimpleXMLElement, SoapClient, SoapFault WSDDFURL = "https://testdia.afip.gov.ar/Dia/Ws/wDigDepFiel/wDigDepFiel.asmx" SOAP_ACTION = 'ar.gov.afip.dia.serviciosWeb.wDigDepFiel/' diff --git a/wsaa.py b/wsaa.py index b7e304a6a..486b6ef34 100644 --- a/wsaa.py +++ b/wsaa.py @@ -23,10 +23,9 @@ import hashlib, datetime, email, os, sys, time, traceback, warnings import unicodedata -from php import date from pysimplesoap.client import SimpleXMLElement from utils import inicializar_y_capturar_excepciones, BaseWS, get_install_dir, \ - exception_info, safe_console + exception_info, safe_console, date try: from M2Crypto import BIO, Rand, SMIME, SSL except ImportError: diff --git a/wsctgv3.py b/wsctgv3.py index 0e3659cff..418e64e47 100644 --- a/wsctgv3.py +++ b/wsctgv3.py @@ -68,7 +68,7 @@ """ import os, sys, time, base64 -from php import date +from utils import date import traceback from pysimplesoap.client import SoapFault import utils