add support python 2.4 and remove support ipython

mcarral · mcarral · commit 26211881a420 · 2018-03-23T14:54:26.000Z
diff --git a/dotenv/__init__.py b/dotenv/__init__.py
@@ -1,9 +1,4 @@
-from .main import load_dotenv, get_key, set_key, unset_key, find_dotenv, dotenv_values
-
-
-def load_ipython_extension(ipython):
-    from .ipython import load_ipython_extension
-    load_ipython_extension(ipython)
+from main import load_dotenv, get_key, set_key, unset_key, find_dotenv, dotenv_values
 
 
 def get_cli_string(path=None, action=None, key=None, value=None, quote=None):
@@ -36,5 +31,4 @@ def get_cli_string(path=None, action=None, key=None, value=None, quote=None):
            'get_key',
            'set_key',
            'unset_key',
-           'find_dotenv',
-           'load_ipython_extension']
+           'find_dotenv']
diff --git a/dotenv/ipython.py b/dotenv/ipython.py
diff --git a/dotenv/main.py b/dotenv/main.py
@@ -1,23 +1,21 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
+# encoding: utf-8
 
-import codecs
-import fileinput
-import io
+#import codecs
+#import fileinput
 import os
 import re
 import sys
 import warnings
-from collections import OrderedDict
+#from ordereddict import OrderedDict
 
-from .compat import StringIO
+from compat import StringIO
 
-__escape_decoder = codecs.getdecoder('unicode_escape')
+#__escape_decoder = codecs.getdecoder('unicode_escape')
 __posix_variable = re.compile('\$\{[^\}]*\}')
 
 
-def decode_escaped(escaped):
-    return __escape_decoder(escaped)[0]
+# def decode_escaped(escaped):
+#     return __escape_decoder(escaped)[0]
 
 
 def parse_line(line):
@@ -39,17 +37,19 @@ def parse_line(line):
         v = v.encode('unicode-escape').decode('ascii')
         quoted = v[0] == v[-1] in ['"', "'"]
         if quoted:
-            v = decode_escaped(v[1:-1])
+            #v = decode_escaped(v[1:-1])
+            v = v[1:-1]
 
     return k, v
 
 
-class DotEnv():
+class DotEnv(object):
 
-    def __init__(self, dotenv_path, verbose=False):
+    def __init__(self, dotenv_path, verbose=False, castvalue=None):
         self.dotenv_path = dotenv_path
         self._dict = None
         self.verbose = verbose
+        self.castvalue = castvalue
 
     def _get_stream(self):
         self._is_file = False
@@ -58,7 +58,7 @@ def _get_stream(self):
 
         if os.path.exists(self.dotenv_path):
             self._is_file = True
-            return io.open(self.dotenv_path)
+            return open(self.dotenv_path)
 
         if self.verbose:
             warnings.warn("File doesn't exist {}".format(self.dotenv_path))
@@ -70,23 +70,26 @@ def dict(self):
         if self._dict:
             return self._dict
 
-        values = OrderedDict(self.parse())
-        self._dict = resolve_nested_variables(values)
+        #values = OrderedDict(self.parse())
+        self._dict = resolve_nested_variables(self.parse())
         return self._dict
 
     def parse(self):
+        dic = {}
         f = self._get_stream()
 
         for line in f:
             key, value = parse_line(line)
             if not key:
                 continue
 
-            yield key, value
+            dic[key] = (lambda: value, lambda: self.castvalue(value))[bool(self.castvalue and callable(self.castvalue))]()
 
         if self._is_file:
             f.close()
 
+        return dic
+
     def set_as_environment_variables(self, override=False):
         """
         Load the current dotenv as system environemt variable.
@@ -118,6 +121,13 @@ def get_key(dotenv_path, key_to_get):
     """
     return DotEnv(dotenv_path, verbose=True).get(key_to_get)
 
+def lines_to_file(dotenv_path, lines):
+    f = open(dotenv_path, 'w')
+    try:
+        for line in lines:
+            f.write("%s\n" % line)
+    finally:
+        f.close()
 
 def set_key(dotenv_path, key_to_set, value_to_set, quote_mode="always"):
     """
@@ -134,20 +144,29 @@ def set_key(dotenv_path, key_to_set, value_to_set, quote_mode="always"):
     if " " in value_to_set:
         quote_mode = "always"
 
-    line_template = '{}="{}"' if quote_mode == "always" else '{}={}'
+    line_template = ('{}={}', '{}="{}"')[quote_mode == "always"]
     line_out = line_template.format(key_to_set, value_to_set)
 
     replaced = False
-    for line in fileinput.input(dotenv_path, inplace=True):
-        k, v = parse_line(line)
-        if k == key_to_set:
-            replaced = True
-            line = line_out
-        print(line, end='')
+    f = open(dotenv_path, 'r')
+    try:
+        lines = []
+        for line in f.readlines():
+            k, v = parse_line(line)
+            if k == key_to_set:
+                replaced = True
+                line = line_out
+            lines.append(line)
+            #print line,  # end not support in python 2.4
+    finally: f.close()
+
+    if replaced: lines_to_file(dotenv_path, lines)
 
     if not replaced:
-        with io.open(dotenv_path, "a") as f:
+        f = open(dotenv_path, "a")
+        try:
             f.write("{}\n".format(line_out))
+        finally: f.close()
 
     return True, key_to_set, value_to_set
 
@@ -165,12 +184,18 @@ def unset_key(dotenv_path, key_to_unset, quote_mode="always"):
         warnings.warn("can't delete from %s - it doesn't exist." % dotenv_path)
         return None, key_to_unset
 
-    for line in fileinput.input(dotenv_path, inplace=True):
-        k, v = parse_line(line)
-        if k == key_to_unset:
-            removed = True
-            line = ''
-        print(line, end='')
+    lines = []
+    f = open(dotenv_path, 'r')
+    try:
+        for line in f.readlines():
+            k, v = parse_line(line)
+            if k == key_to_unset:
+                removed = True
+                line = ''
+            lines.append(line)
+    finally: f.close()
+
+    if removed: lines_to_file(dotenv_path, lines)
 
     if not removed:
         warnings.warn("key %s not removed from %s - key doesn't exist." % (key_to_unset, dotenv_path))
@@ -245,9 +270,9 @@ def find_dotenv(filename='.env', raise_error_if_not_found=False, usecwd=False):
     return ''
 
 
-def load_dotenv(dotenv_path=None, stream=None, verbose=False, override=False):
+def load_dotenv(dotenv_path=None, stream=None, verbose=False, override=False, castvalue=None):
     f = dotenv_path or stream or find_dotenv()
-    return DotEnv(f, verbose=verbose).set_as_environment_variables(override=override)
+    return DotEnv(f, verbose=verbose, castvalue=castvalue).set_as_environment_variables(override=override)
 
 
 def dotenv_values(dotenv_path=None, stream=None, verbose=False):
