python · abalkin · Jan 9, 2018 · Dec 10, 2017 · pganssle · Dec 13, 2017
diff --git a/Lib/_strptime.py b/Lib/_strptime.py
@@ -470,7 +470,10 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
                minutes = int(z[3:5])
                seconds = int(z[5:7] or 0)
                gmtoff = (hours * 60 * 60) + (minutes * 60) + seconds
-                gmtoff_fraction = int(z[8:] or 0)
+                gmtoff_remainder = z[8:]
+                # Pad to always return microseconds.
+                gmtoff_remainder_padding = "0" * (6 - len(gmtoff_remainder))
+                gmtoff_fraction = int(gmtoff_remainder + gmtoff_remainder_padding)
                if z.startswith("-"):
                    gmtoff = -gmtoff
                    gmtoff_fraction = -gmtoff_fraction

diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py
@@ -345,6 +345,9 @@ def test_offset(self):
        (*_, offset), _, offset_fraction = _strptime._strptime("-01:30:30.000001", "%z")
        self.assertEqual(offset, -(one_hour + half_hour + half_minute))
        self.assertEqual(offset_fraction, -1)
+        (*_, offset), _, offset_fraction = _strptime._strptime("+01:30:30.001", "%z")
+        self.assertEqual(offset, one_hour + half_hour + half_minute)
+        self.assertEqual(offset_fraction, 1000)
        (*_, offset), _, offset_fraction = _strptime._strptime("Z", "%z")
        self.assertEqual(offset, 0)
        self.assertEqual(offset_fraction, 0)
-Original file line number
+Diff line change
@@ -470,7 +470,10 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
                     minutes = int(z[3:5])
                     seconds = int(z[5:7] or 0)
                     gmtoff = (hours * 60 * 60) + (minutes * 60) + seconds
-                    gmtoff_fraction = int(z[8:] or 0)
+                    gmtoff_remainder = z[8:]
+                    # Pad to always return microseconds.
+                    gmtoff_remainder_padding = "0" * (6 - len(gmtoff_remainder))
         Comment thread


        

        
      

        
          


  
    
        
        
  
    
      
          
      

      
            pganssle
  

      

      

      


        Dec 13, 2017



      
    

  

  
    
      
          
    
  


        
            
  
      
              Copy link

  
              
  
      
                Copy Markdown

  
        
      
    

    
        

  
  Member


        

    
  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I did a microbenchmark for this vs. multiplying by 10**(6-len(gmtoff_remainder)) and it seems like your version is either faster or the same speed. Maybe that's why you chose this method, but I thought I'd chime in since I went through the trouble to check it.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
            mariocj89 reacted with thumbs up emoji
      
        
            
    All reactions
  


          
              
                👍
                  1 reaction
+                    gmtoff_fraction = int(gmtoff_remainder + gmtoff_remainder_padding)
                     if z.startswith("-"):
                         gmtoff = -gmtoff
                         gmtoff_fraction = -gmtoff_fraction
-          Expand Down