Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristhofer Travieso <cristhofert97@gmail.com>2012-07-03 20:59:27 (GMT)
committer Cristhofer Travieso <cristhofert97@gmail.com>2012-07-03 20:59:27 (GMT)
commit2f9bb852d14a1e0e16a1ebe31160931cf1ee2836 (patch)
tree302cb10777badb84173cd5d1212610ee2bee5e4e
parent3af8ddcbf88aa38bba067dc09828709049b390e1 (diff)
Hise los ultimos arreglos para que funcione
-rw-r--r--convert.py43
1 files changed, 18 insertions, 25 deletions
diff --git a/convert.py b/convert.py
index 413a573..aad7114 100644
--- a/convert.py
+++ b/convert.py
@@ -15,39 +15,32 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# adic_long with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-import sys
+def convert(number, uni1, uni2, type_u):
+ dic = {}
-def convert(self, number, uni1, uni2, type_u):
- self.dic = {}
+ dic_long = {"Metro": 1, "Yarda": 1.09361, "Pie": 3.28084, "Brazas": 0.5468}
+ vol = {}
+ area = {}
+ peso = {}
+ vel = {}
+ time = {}
- self.long = {}
- self.vol = {}
- self.area = {}
- self.peso = {}
- self.vel = {}
- self.time = {}
-
- if type_u == "long":
- self.dic = self.long
+ if type_u == "dic_long":
+ dic = dic_long
elif type_u == "vol":
- self.dic = self.vol
+ dic = vol
elif type_u == "area":
- self.dic = self.area
+ dic = area
elif type_u == "peso":
- self.dic = self.peso
+ dic = peso
elif type_u == "vel":
- self.dic = self.vel
+ dic = vel
elif type_u == "time":
- self.dic = self.time
-
- self.unidad = number * self.dic[uni1]
-
- return self.unidad * self.dic[uni2]
+ dic = time
-def main():
- print convert(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])
+ unidad = number * dic[uni1]
-main()
+ return unidad * dic[uni2]