Remove uses of universal newlines mode; fix logger.warn -> logger.war…

…ning
enthought · May 22, 2014 · 7a25c88 · 7a25c88
1 parent 83eb368
commit 7a25c88
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/traits/util/deprecated.py b/traits/util/deprecated.py
@@ -25,7 +25,7 @@ def wrapper(*args, **kw):
             function_name = fn.__name__
 
             if (module_name, function_name) not in _cache:
-                logging.getLogger(module_name).warn(
+                logging.getLogger(module_name).warning(
                     'DEPRECATED: %s.%s, %s' % (
                         module_name, function_name, message
                     )

diff --git a/traits/util/tests/test_record_containers.py b/traits/util/tests/test_record_containers.py
@@ -39,7 +39,7 @@ def test_record_container(self):
         # save records
         container.save_to_file(self.filename)
 
-        with open(self.filename, 'Ur') as handle:
+        with open(self.filename, 'r') as handle:
             lines = handle.readlines()
         self.assertEqual(lines, ['\n'] * 7)
 
@@ -69,7 +69,7 @@ def record(container):
         container.save_to_directory(self.directory)
         for name in container._record_containers:
             filename = os.path.join(self.directory, '{0}.trace'.format(name))
-            with open(filename, 'Ur') as handle:
+            with open(filename, 'r') as handle:
                 lines = handle.readlines()
             self.assertEqual(lines, ['\n'])
 

diff --git a/traits/util/tests/test_record_events.py b/traits/util/tests/test_record_events.py
@@ -59,7 +59,7 @@ def test_change_event_recorder(self):
 
         filename = os.path.join(self.directory, 'MainThread.trace')
         container.save_to_file(filename)
-        with open(filename, 'Ur') as handle:
+        with open(filename, 'r') as handle:
             lines = handle.readlines()
             self.assertEqual(len(lines), 4)
             # very basic checking
@@ -90,7 +90,7 @@ def test_multi_thread_change_event_recorder(self):
         container.save_to_directory(self.directory)
         for name in container._record_containers:
             filename = os.path.join(self.directory, '{0}.trace'.format(name))
-            with open(filename, 'Ur') as handle:
+            with open(filename, 'r') as handle:
                 lines = handle.readlines()
             self.assertEqual(len(lines), 4)
             # very basic checking
@@ -118,7 +118,7 @@ def test_record_events(self):
         container.save_to_directory(self.directory)
         for name in container._record_containers:
             filename = os.path.join(self.directory, '{0}.trace'.format(name))
-            with open(filename, 'Ur') as handle:
+            with open(filename, 'r') as handle:
                 lines = handle.readlines()
             self.assertEqual(len(lines), 4)
             # very basic checking